From 08e46815143559e66a960f7770697a88d760a3f3 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 1 Nov 2024 08:11:58 -0700
Subject: [PATCH 001/111] chore: improve token lookup performance in
 `useAccountTotalFiatBalance` (#28233)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

`useAccountTotalFiatBalance` looks up each token in the token list to
add additional fields. But it was O(n) searching through the entire
list, which can be thousands of tokens. The token list is keyed on token
address, and can be queried directly instead.

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

## **Related issues**



## **Manual testing steps**

No visual changes. In the account picker, erc20 tokens should still have
icons on the right of each account.

## **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.
---
 ui/hooks/useAccountTotalFiatBalance.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/ui/hooks/useAccountTotalFiatBalance.js b/ui/hooks/useAccountTotalFiatBalance.js
index b0c9b293c906..7b4a4675225a 100644
--- a/ui/hooks/useAccountTotalFiatBalance.js
+++ b/ui/hooks/useAccountTotalFiatBalance.js
@@ -51,7 +51,6 @@ export const useAccountTotalFiatBalance = (
   const tokens = detectedTokens?.[currentChainId]?.[account?.address] ?? [];
   // This selector returns all the tokens, we need it to get the image of token
   const allTokenList = useSelector(getTokenList);
-  const allTokenListValues = Object.values(allTokenList);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
   const nativeCurrency = useSelector(getNativeCurrency);
 
@@ -92,20 +91,18 @@ export const useAccountTotalFiatBalance = (
   };
 
   // To match the list of detected tokens with the entire token list to find the image for tokens
-  const findMatchingTokens = (array1, array2) => {
+  const findMatchingTokens = (tokenList, _tokensWithBalances) => {
     const result = [];
 
-    array2.forEach((token2) => {
-      const matchingToken = array1.find(
-        (token1) => token1.symbol === token2.symbol,
-      );
+    _tokensWithBalances.forEach((token) => {
+      const matchingToken = tokenList[token.address.toLowerCase()];
 
       if (matchingToken) {
         result.push({
           ...matchingToken,
-          balance: token2.balance,
-          string: token2.string,
-          balanceError: token2.balanceError,
+          balance: token.balance,
+          string: token.string,
+          balanceError: token.balanceError,
         });
       }
     });
@@ -113,10 +110,7 @@ export const useAccountTotalFiatBalance = (
     return result;
   };
 
-  const matchingTokens = findMatchingTokens(
-    allTokenListValues,
-    tokensWithBalances,
-  );
+  const matchingTokens = findMatchingTokens(allTokenList, tokensWithBalances);
 
   // Combine native token, detected token with image in an array
   const allTokensWithFiatValues = [

From 9b85efbe7953d2ed269ad51852bf0788e082fb80 Mon Sep 17 00:00:00 2001
From: Kanthesha Devaramane <kanthesha.devaramane@consensys.net>
Date: Fri, 1 Nov 2024 17:00:22 +0000
Subject: [PATCH 002/111] feat: Upgrade alert controller to base controller v2
 (#28054)
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**
Following the [Wallet Framework team's OKRs for Q3
2024](https://docs.google.com/document/d/1JLEzfUxHlT8lw8ntgMWG0vQb5BAATcrYZDj0wRB2ogI/edit#heading=h.kzzai3cfecro),
we want to bring AlertController up to date with our latest controller
patterns.
<!--
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/28054?quickstart=1)

## **Related issues**

Fixes: #25915

## **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
- [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.
---
 .../controllers/alert-controller.test.ts      | 303 +++++++-----------
 app/scripts/controllers/alert-controller.ts   | 124 ++++---
 app/scripts/metamask-controller.js            |   6 +-
 3 files changed, 189 insertions(+), 244 deletions(-)

diff --git a/app/scripts/controllers/alert-controller.test.ts b/app/scripts/controllers/alert-controller.test.ts
index a8aee606e02d..de314c31f050 100644
--- a/app/scripts/controllers/alert-controller.test.ts
+++ b/app/scripts/controllers/alert-controller.test.ts
@@ -2,16 +2,16 @@
  * @jest-environment node
  */
 import { ControllerMessenger } from '@metamask/base-controller';
-import { KeyringControllerStateChangeEvent } from '@metamask/keyring-controller';
-import { SnapControllerStateChangeEvent } from '@metamask/snaps-controllers';
 import { EthAccountType } from '@metamask/keyring-api';
 import {
-  AlertControllerActions,
-  AlertControllerEvents,
   AlertController,
   AllowedActions,
   AllowedEvents,
-  AlertControllerState,
+  AlertControllerMessenger,
+  AlertControllerGetStateAction,
+  AlertControllerStateChangeEvent,
+  AlertControllerOptions,
+  getDefaultAlertControllerState,
 } from './alert-controller';
 
 const EMPTY_ACCOUNT = {
@@ -28,230 +28,153 @@ const EMPTY_ACCOUNT = {
     importTime: 0,
   },
 };
-describe('AlertController', () => {
-  let controllerMessenger: ControllerMessenger<
-    AlertControllerActions | AllowedActions,
-    | AlertControllerEvents
-    | KeyringControllerStateChangeEvent
-    | SnapControllerStateChangeEvent
-    | AllowedEvents
+
+type WithControllerOptions = Partial<AlertControllerOptions>;
+
+type WithControllerCallback<ReturnValue> = ({
+  controller,
+}: {
+  controller: AlertController;
+  messenger: ControllerMessenger<
+    AllowedActions | AlertControllerGetStateAction,
+    AllowedEvents | AlertControllerStateChangeEvent
   >;
-  let alertController: AlertController;
+}) => ReturnValue;
+
+type WithControllerArgs<ReturnValue> =
+  | [WithControllerCallback<ReturnValue>]
+  | [WithControllerOptions, WithControllerCallback<ReturnValue>];
 
-  beforeEach(() => {
-    controllerMessenger = new ControllerMessenger<
-      AllowedActions,
-      AllowedEvents
-    >();
-    controllerMessenger.registerActionHandler(
-      'AccountsController:getSelectedAccount',
-      () => EMPTY_ACCOUNT,
-    );
+async function withController<ReturnValue>(
+  ...args: WithControllerArgs<ReturnValue>
+): Promise<ReturnValue> {
+  const [{ ...rest }, fn] = args.length === 2 ? args : [{}, args[0]];
+  const { ...alertControllerOptions } = rest;
 
-    const alertMessenger = controllerMessenger.getRestricted({
+  const controllerMessenger = new ControllerMessenger<
+    AllowedActions | AlertControllerGetStateAction,
+    AllowedEvents | AlertControllerStateChangeEvent
+  >();
+
+  const alertControllerMessenger: AlertControllerMessenger =
+    controllerMessenger.getRestricted({
       name: 'AlertController',
-      allowedActions: [`AccountsController:getSelectedAccount`],
-      allowedEvents: [`AccountsController:selectedAccountChange`],
+      allowedActions: ['AccountsController:getSelectedAccount'],
+      allowedEvents: ['AccountsController:selectedAccountChange'],
     });
 
-    alertController = new AlertController({
-      state: {
-        unconnectedAccountAlertShownOrigins: {
-          testUnconnectedOrigin: false,
-        },
-        web3ShimUsageOrigins: {
-          testWeb3ShimUsageOrigin: 0,
-        },
-      },
-      controllerMessenger: alertMessenger,
-    });
+  controllerMessenger.registerActionHandler(
+    'AccountsController:getSelectedAccount',
+    jest.fn().mockReturnValue(EMPTY_ACCOUNT),
+  );
+
+  const controller = new AlertController({
+    messenger: alertControllerMessenger,
+    ...alertControllerOptions,
   });
 
+  return await fn({
+    controller,
+    messenger: controllerMessenger,
+  });
+}
+
+describe('AlertController', () => {
   describe('default state', () => {
-    it('should be same as AlertControllerState initialized', () => {
-      expect(alertController.store.getState()).toStrictEqual({
-        alertEnabledness: {
-          unconnectedAccount: true,
-          web3ShimUsage: true,
-        },
-        unconnectedAccountAlertShownOrigins: {
-          testUnconnectedOrigin: false,
-        },
-        web3ShimUsageOrigins: {
-          testWeb3ShimUsageOrigin: 0,
-        },
+    it('should be same as AlertControllerState initialized', async () => {
+      await withController(({ controller }) => {
+        expect(controller.state).toStrictEqual(
+          getDefaultAlertControllerState(),
+        );
       });
     });
   });
 
   describe('alertEnabledness', () => {
-    it('should default unconnectedAccount of alertEnabledness to true', () => {
-      expect(
-        alertController.store.getState().alertEnabledness.unconnectedAccount,
-      ).toStrictEqual(true);
+    it('should default unconnectedAccount of alertEnabledness to true', async () => {
+      await withController(({ controller }) => {
+        expect(
+          controller.state.alertEnabledness.unconnectedAccount,
+        ).toStrictEqual(true);
+      });
     });
 
-    it('should set unconnectedAccount of alertEnabledness to false', () => {
-      alertController.setAlertEnabledness('unconnectedAccount', false);
-      expect(
-        alertController.store.getState().alertEnabledness.unconnectedAccount,
-      ).toStrictEqual(false);
-      expect(
-        controllerMessenger.call('AlertController:getState').alertEnabledness
-          .unconnectedAccount,
-      ).toStrictEqual(false);
+    it('should set unconnectedAccount of alertEnabledness to false', async () => {
+      await withController(({ controller }) => {
+        controller.setAlertEnabledness('unconnectedAccount', false);
+        expect(
+          controller.state.alertEnabledness.unconnectedAccount,
+        ).toStrictEqual(false);
+      });
     });
   });
 
   describe('unconnectedAccountAlertShownOrigins', () => {
-    it('should default unconnectedAccountAlertShownOrigins', () => {
-      expect(
-        alertController.store.getState().unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({
-        testUnconnectedOrigin: false,
-      });
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({
-        testUnconnectedOrigin: false,
+    it('should default unconnectedAccountAlertShownOrigins', async () => {
+      await withController(({ controller }) => {
+        expect(
+          controller.state.unconnectedAccountAlertShownOrigins,
+        ).toStrictEqual({});
       });
     });
 
-    it('should set unconnectedAccountAlertShownOrigins', () => {
-      alertController.setUnconnectedAccountAlertShown('testUnconnectedOrigin');
-      expect(
-        alertController.store.getState().unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({
-        testUnconnectedOrigin: true,
-      });
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({
-        testUnconnectedOrigin: true,
+    it('should set unconnectedAccountAlertShownOrigins', async () => {
+      await withController(({ controller }) => {
+        controller.setUnconnectedAccountAlertShown('testUnconnectedOrigin');
+        expect(
+          controller.state.unconnectedAccountAlertShownOrigins,
+        ).toStrictEqual({
+          testUnconnectedOrigin: true,
+        });
       });
     });
   });
 
   describe('web3ShimUsageOrigins', () => {
-    it('should default web3ShimUsageOrigins', () => {
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 0,
-      });
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 0,
+    it('should default web3ShimUsageOrigins', async () => {
+      await withController(({ controller }) => {
+        expect(controller.state.web3ShimUsageOrigins).toStrictEqual({});
       });
     });
 
-    it('should set origin of web3ShimUsageOrigins to recorded', () => {
-      alertController.setWeb3ShimUsageRecorded('testWeb3ShimUsageOrigin');
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 1,
-      });
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 1,
+    it('should set origin of web3ShimUsageOrigins to recorded', async () => {
+      await withController(({ controller }) => {
+        controller.setWeb3ShimUsageRecorded('testWeb3ShimUsageOrigin');
+        expect(controller.state.web3ShimUsageOrigins).toStrictEqual({
+          testWeb3ShimUsageOrigin: 1,
+        });
       });
     });
-    it('should set origin of web3ShimUsageOrigins to dismissed', () => {
-      alertController.setWeb3ShimUsageAlertDismissed('testWeb3ShimUsageOrigin');
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 2,
-      });
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 2,
+    it('should set origin of web3ShimUsageOrigins to dismissed', async () => {
+      await withController(({ controller }) => {
+        controller.setWeb3ShimUsageAlertDismissed('testWeb3ShimUsageOrigin');
+        expect(controller.state.web3ShimUsageOrigins).toStrictEqual({
+          testWeb3ShimUsageOrigin: 2,
+        });
       });
     });
   });
 
   describe('selectedAccount change', () => {
-    it('should set unconnectedAccountAlertShownOrigins to {}', () => {
-      controllerMessenger.publish('AccountsController:selectedAccountChange', {
-        id: '',
-        address: '0x1234567',
-        options: {},
-        methods: [],
-        type: 'eip155:eoa',
-        metadata: {
-          name: '',
-          keyring: {
-            type: '',
+    it('should set unconnectedAccountAlertShownOrigins to {}', async () => {
+      await withController(({ controller, messenger }) => {
+        messenger.publish('AccountsController:selectedAccountChange', {
+          id: '',
+          address: '0x1234567',
+          options: {},
+          methods: [],
+          type: 'eip155:eoa',
+          metadata: {
+            name: '',
+            keyring: {
+              type: '',
+            },
+            importTime: 0,
           },
-          importTime: 0,
-        },
-      });
-      expect(
-        alertController.store.getState().unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({});
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .unconnectedAccountAlertShownOrigins,
-      ).toStrictEqual({});
-    });
-  });
-
-  describe('AlertController:getState', () => {
-    it('should return the current state of the property', () => {
-      const defaultWeb3ShimUsageOrigins = {
-        testWeb3ShimUsageOrigin: 0,
-      };
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual(defaultWeb3ShimUsageOrigins);
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .web3ShimUsageOrigins,
-      ).toStrictEqual(defaultWeb3ShimUsageOrigins);
-    });
-  });
-
-  describe('AlertController:stateChange', () => {
-    it('state will be published when there is state change', () => {
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 0,
-      });
-
-      controllerMessenger.subscribe(
-        'AlertController:stateChange',
-        (state: Partial<AlertControllerState>) => {
-          expect(state.web3ShimUsageOrigins).toStrictEqual({
-            testWeb3ShimUsageOrigin: 1,
-          });
-        },
-      );
-
-      alertController.setWeb3ShimUsageRecorded('testWeb3ShimUsageOrigin');
-
-      expect(
-        alertController.store.getState().web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 1,
-      });
-      expect(
-        alertController.getWeb3ShimUsageState('testWeb3ShimUsageOrigin'),
-      ).toStrictEqual(1);
-      expect(
-        controllerMessenger.call('AlertController:getState')
-          .web3ShimUsageOrigins,
-      ).toStrictEqual({
-        testWeb3ShimUsageOrigin: 1,
+        });
+        expect(
+          controller.state.unconnectedAccountAlertShownOrigins,
+        ).toStrictEqual({});
       });
     });
   });
diff --git a/app/scripts/controllers/alert-controller.ts b/app/scripts/controllers/alert-controller.ts
index 9e1882035e02..90e177e9edca 100644
--- a/app/scripts/controllers/alert-controller.ts
+++ b/app/scripts/controllers/alert-controller.ts
@@ -1,9 +1,13 @@
-import { ObservableStore } from '@metamask/obs-store';
 import {
   AccountsControllerGetSelectedAccountAction,
   AccountsControllerSelectedAccountChangeEvent,
 } from '@metamask/accounts-controller';
-import { RestrictedControllerMessenger } from '@metamask/base-controller';
+import {
+  BaseController,
+  ControllerGetStateAction,
+  ControllerStateChangeEvent,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
 import {
   TOGGLEABLE_ALERT_TYPES,
   Web3ShimUsageAlertStates,
@@ -14,10 +18,10 @@ const controllerName = 'AlertController';
 /**
  * Returns the state of the {@link AlertController}.
  */
-export type AlertControllerGetStateAction = {
-  type: 'AlertController:getState';
-  handler: () => AlertControllerState;
-};
+export type AlertControllerGetStateAction = ControllerGetStateAction<
+  typeof controllerName,
+  AlertControllerState
+>;
 
 /**
  * Actions exposed by the {@link AlertController}.
@@ -27,10 +31,10 @@ export type AlertControllerActions = AlertControllerGetStateAction;
 /**
  * Event emitted when the state of the {@link AlertController} changes.
  */
-export type AlertControllerStateChangeEvent = {
-  type: 'AlertController:stateChange';
-  payload: [AlertControllerState, []];
-};
+export type AlertControllerStateChangeEvent = ControllerStateChangeEvent<
+  typeof controllerName,
+  AlertControllerState
+>;
 
 /**
  * Events emitted by {@link AlertController}.
@@ -76,12 +80,15 @@ export type AlertControllerState = {
  * @property state - The initial controller state
  * @property controllerMessenger - The controller messenger
  */
-type AlertControllerOptions = {
+export type AlertControllerOptions = {
   state?: Partial<AlertControllerState>;
-  controllerMessenger: AlertControllerMessenger;
+  messenger: AlertControllerMessenger;
 };
 
-const defaultState: AlertControllerState = {
+/**
+ * Function to get default state of the {@link AlertController}.
+ */
+export const getDefaultAlertControllerState = (): AlertControllerState => ({
   alertEnabledness: TOGGLEABLE_ALERT_TYPES.reduce(
     (alertEnabledness: Record<string, boolean>, alertType: string) => {
       alertEnabledness[alertType] = true;
@@ -91,61 +98,76 @@ const defaultState: AlertControllerState = {
   ),
   unconnectedAccountAlertShownOrigins: {},
   web3ShimUsageOrigins: {},
+});
+
+/**
+ * {@link AlertController}'s metadata.
+ *
+ * This allows us to choose if fields of the state should be persisted or not
+ * using the `persist` flag; and if they can be sent to Sentry or not, using
+ * the `anonymous` flag.
+ */
+const controllerMetadata = {
+  alertEnabledness: {
+    persist: true,
+    anonymous: true,
+  },
+  unconnectedAccountAlertShownOrigins: {
+    persist: true,
+    anonymous: false,
+  },
+  web3ShimUsageOrigins: {
+    persist: true,
+    anonymous: false,
+  },
 };
 
 /**
  * Controller responsible for maintaining alert-related state.
  */
-export class AlertController {
-  store: ObservableStore<AlertControllerState>;
-
-  readonly #controllerMessenger: AlertControllerMessenger;
-
+export class AlertController extends BaseController<
+  typeof controllerName,
+  AlertControllerState,
+  AlertControllerMessenger
+> {
   #selectedAddress: string;
 
   constructor(opts: AlertControllerOptions) {
-    const state: AlertControllerState = {
-      ...defaultState,
-      ...opts.state,
-    };
-
-    this.store = new ObservableStore(state);
-    this.#controllerMessenger = opts.controllerMessenger;
-    this.#controllerMessenger.registerActionHandler(
-      'AlertController:getState',
-      () => this.store.getState(),
-    );
-    this.store.subscribe((alertState: AlertControllerState) => {
-      this.#controllerMessenger.publish(
-        'AlertController:stateChange',
-        alertState,
-        [],
-      );
+    super({
+      messenger: opts.messenger,
+      metadata: controllerMetadata,
+      name: controllerName,
+      state: {
+        ...getDefaultAlertControllerState(),
+        ...opts.state,
+      },
     });
 
-    this.#selectedAddress = this.#controllerMessenger.call(
+    this.#selectedAddress = this.messagingSystem.call(
       'AccountsController:getSelectedAccount',
     ).address;
 
-    this.#controllerMessenger.subscribe(
+    this.messagingSystem.subscribe(
       'AccountsController:selectedAccountChange',
       (account: { address: string }) => {
-        const currentState = this.store.getState();
+        const currentState = this.state;
         if (
           currentState.unconnectedAccountAlertShownOrigins &&
           this.#selectedAddress !== account.address
         ) {
           this.#selectedAddress = account.address;
-          this.store.updateState({ unconnectedAccountAlertShownOrigins: {} });
+          this.update((state) => {
+            state.unconnectedAccountAlertShownOrigins = {};
+          });
         }
       },
     );
   }
 
   setAlertEnabledness(alertId: string, enabledness: boolean): void {
-    const { alertEnabledness } = this.store.getState();
-    alertEnabledness[alertId] = enabledness;
-    this.store.updateState({ alertEnabledness });
+    this.update((state) => {
+      state.alertEnabledness[alertId] = enabledness;
+    });
   }
 
   /**
@@ -154,9 +176,9 @@ export class AlertController {
    * @param origin - The origin the alert has been shown for
    */
   setUnconnectedAccountAlertShown(origin: string): void {
-    const { unconnectedAccountAlertShownOrigins } = this.store.getState();
-    unconnectedAccountAlertShownOrigins[origin] = true;
-    this.store.updateState({ unconnectedAccountAlertShownOrigins });
+    this.update((state) => {
+      state.unconnectedAccountAlertShownOrigins[origin] = true;
+    });
   }
 
   /**
@@ -167,7 +189,7 @@ export class AlertController {
    * origin, or undefined.
    */
   getWeb3ShimUsageState(origin: string): number | undefined {
-    return this.store.getState().web3ShimUsageOrigins?.[origin];
+    return this.state.web3ShimUsageOrigins?.[origin];
   }
 
   /**
@@ -194,10 +216,10 @@ export class AlertController {
    * @param value - The state value to set.
    */
   #setWeb3ShimUsageState(origin: string, value: number): void {
-    const { web3ShimUsageOrigins } = this.store.getState();
-    if (web3ShimUsageOrigins) {
-      web3ShimUsageOrigins[origin] = value;
-      this.store.updateState({ web3ShimUsageOrigins });
-    }
+    this.update((state) => {
+      if (state.web3ShimUsageOrigins) {
+        state.web3ShimUsageOrigins[origin] = value;
+      }
+    });
   }
 }
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 55f5e881de4a..009f87634caa 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1797,7 +1797,7 @@ export default class MetamaskController extends EventEmitter {
 
     this.alertController = new AlertController({
       state: initState.AlertController,
-      controllerMessenger: this.controllerMessenger.getRestricted({
+      messenger: this.controllerMessenger.getRestricted({
         name: 'AlertController',
         allowedEvents: ['AccountsController:selectedAccountChange'],
         allowedActions: ['AccountsController:getSelectedAccount'],
@@ -2383,7 +2383,7 @@ export default class MetamaskController extends EventEmitter {
       AddressBookController: this.addressBookController,
       CurrencyController: this.currencyRateController,
       NetworkController: this.networkController,
-      AlertController: this.alertController.store,
+      AlertController: this.alertController,
       OnboardingController: this.onboardingController,
       PermissionController: this.permissionController,
       PermissionLogController: this.permissionLogController,
@@ -2438,7 +2438,7 @@ export default class MetamaskController extends EventEmitter {
           this.metaMetricsDataDeletionController,
         AddressBookController: this.addressBookController,
         CurrencyController: this.currencyRateController,
-        AlertController: this.alertController.store,
+        AlertController: this.alertController,
         OnboardingController: this.onboardingController,
         PermissionController: this.permissionController,
         PermissionLogController: this.permissionLogController,

From 8c4af60886775f2bbffc475f5f7e12fd2200ec01 Mon Sep 17 00:00:00 2001
From: Niranjana Binoy <43930900+NiranjanaBinoy@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:00:33 -0400
Subject: [PATCH 003/111] fix: Error handling for the state log download
 failure (#26999)
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**
Display error message if the `exportAsFile()` for state log download in
advanced tab in the settings fails.
<!--
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/26999?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Throw an error artificially in the `exportAsFile()` state logs
download function
2. `Failed to download state log.` message is diaplayed


## **Screenshots/Recordings**

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

### **Before**
<img width="1316" alt="Screenshot 2024-11-01 at 10 21 23 AM"
src="https://github.com/user-attachments/assets/011f8ed9-513e-4593-8508-ead32492ea66">

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

### **After**

<img width="1316" alt="Screenshot 2024-11-01 at 10 34 37 AM"
src="https://github.com/user-attachments/assets/1242444d-d8ed-453d-9b58-9407c3578fd6">

<!-- [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/ducks/app/app.test.js                      | 19 ++++++
 ui/ducks/app/app.ts                           | 33 +++++++++++
 .../advanced-tab.component.test.js.snap       |  1 +
 .../advanced-tab/advanced-tab.component.js    | 34 +++++++----
 .../advanced-tab.component.test.js            | 59 ++++++++++++++++++-
 .../advanced-tab/advanced-tab.container.js    | 13 ++--
 .../advanced-tab/advanced-tab.stories.js      |  3 +-
 ui/store/actionConstants.ts                   |  2 +
 8 files changed, 146 insertions(+), 18 deletions(-)

diff --git a/ui/ducks/app/app.test.js b/ui/ducks/app/app.test.js
index 9a7a93ea958b..27b20a5841b3 100644
--- a/ui/ducks/app/app.test.js
+++ b/ui/ducks/app/app.test.js
@@ -339,4 +339,23 @@ describe('App State', () => {
 
     expect(state.showDataDeletionErrorModal).toStrictEqual(false);
   });
+
+  it('displays error in settings', () => {
+    const state = reduceApp(metamaskState, {
+      type: actions.SHOW_SETTINGS_PAGE_ERROR,
+      payload: 'settings page error',
+    });
+
+    expect(state.errorInSettings).toStrictEqual('settings page error');
+  });
+
+  it('hides error in settings', () => {
+    const displayErrorInSettings = { errorInSettings: 'settings page error' };
+    const oldState = { ...metamaskState, ...displayErrorInSettings };
+    const state = reduceApp(oldState, {
+      type: actions.HIDE_SETTINGS_PAGE_ERROR,
+    });
+
+    expect(state.errorInSettings).toBeNull();
+  });
 });
diff --git a/ui/ducks/app/app.ts b/ui/ducks/app/app.ts
index e6a7855ce7a5..81f875446f1e 100644
--- a/ui/ducks/app/app.ts
+++ b/ui/ducks/app/app.ts
@@ -105,6 +105,7 @@ type AppState = {
   snapsInstallPrivacyWarningShown: boolean;
   isAddingNewNetwork: boolean;
   isMultiRpcOnboarding: boolean;
+  errorInSettings: string | null;
 };
 
 export type AppSliceState = {
@@ -192,6 +193,7 @@ const initialState: AppState = {
   snapsInstallPrivacyWarningShown: false,
   isAddingNewNetwork: false,
   isMultiRpcOnboarding: false,
+  errorInSettings: null,
 };
 
 export default function reduceApp(
@@ -632,6 +634,16 @@ export default function reduceApp(
         ...appState,
         showDataDeletionErrorModal: false,
       };
+    case actionConstants.SHOW_SETTINGS_PAGE_ERROR:
+      return {
+        ...appState,
+        errorInSettings: action.payload,
+      };
+    case actionConstants.HIDE_SETTINGS_PAGE_ERROR:
+      return {
+        ...appState,
+        errorInSettings: null,
+      };
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     case actionConstants.SHOW_KEYRING_SNAP_REMOVAL_RESULT:
       return {
@@ -720,6 +732,27 @@ export function setCustomTokenAmount(payload: string): PayloadAction<string> {
   return { type: actionConstants.SET_CUSTOM_TOKEN_AMOUNT, payload };
 }
 
+/**
+ * An action creator for display a error to the user in various places in the
+ * UI. It will not be cleared until a new warning replaces it or `hideWarning`
+ * is called.
+ *
+ * @param payload - The warning to show.
+ * @returns The action to display the warning.
+ */
+export function displayErrorInSettings(payload: string): PayloadAction<string> {
+  return {
+    type: actionConstants.SHOW_SETTINGS_PAGE_ERROR,
+    payload,
+  };
+}
+
+export function hideErrorInSettings() {
+  return {
+    type: actionConstants.HIDE_SETTINGS_PAGE_ERROR,
+  };
+}
+
 // Selectors
 export function getQrCodeData(state: AppSliceState): {
   type?: string | null;
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 6318abd37570..e914c54fe4ca 100644
--- a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
+++ b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
@@ -29,6 +29,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         >
           <button
             class="button btn--rounded btn-secondary btn--large"
+            data-testid="advanced-setting-state-logs-button"
           >
             Download state logs
           </button>
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 50aea4e0dc60..132b97f7caa9 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -40,9 +40,10 @@ export default class AdvancedTab extends PureComponent {
     setUseNonceField: PropTypes.func,
     useNonceField: PropTypes.bool,
     setHexDataFeatureFlag: PropTypes.func,
-    displayWarning: PropTypes.func,
+    displayErrorInSettings: PropTypes.func,
+    hideErrorInSettings: PropTypes.func,
     showResetAccountConfirmationModal: PropTypes.func,
-    warning: PropTypes.string,
+    errorInSettings: PropTypes.string,
     sendHexData: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
     showTestNetworks: PropTypes.bool,
@@ -80,7 +81,9 @@ export default class AdvancedTab extends PureComponent {
 
   componentDidMount() {
     const { t } = this.context;
+    const { hideErrorInSettings } = this.props;
     handleSettingsRefs(t, t('advanced'), this.settingsRefs);
+    hideErrorInSettings();
   }
 
   async getTextFromFile(file) {
@@ -112,7 +115,7 @@ export default class AdvancedTab extends PureComponent {
 
   renderStateLogs() {
     const { t } = this.context;
-    const { displayWarning } = this.props;
+    const { displayErrorInSettings } = this.props;
 
     return (
       <Box
@@ -133,16 +136,21 @@ export default class AdvancedTab extends PureComponent {
             <Button
               type="secondary"
               large
+              data-testid="advanced-setting-state-logs-button"
               onClick={() => {
-                window.logStateString((err, result) => {
+                window.logStateString(async (err, result) => {
                   if (err) {
-                    displayWarning(t('stateLogError'));
+                    displayErrorInSettings(t('stateLogError'));
                   } else {
-                    exportAsFile(
-                      `${t('stateLogFileName')}.json`,
-                      result,
-                      ExportableContentType.JSON,
-                    );
+                    try {
+                      await exportAsFile(
+                        `${t('stateLogFileName')}.json`,
+                        result,
+                        ExportableContentType.JSON,
+                      );
+                    } catch (error) {
+                      displayErrorInSettings(error.message);
+                    }
                   }
                 });
               }}
@@ -576,11 +584,13 @@ export default class AdvancedTab extends PureComponent {
   }
 
   render() {
-    const { warning } = this.props;
+    const { errorInSettings } = this.props;
     // When adding/removing/editing the order of renders, double-check the order of the settingsRefs. This affects settings-search.js
     return (
       <div className="settings-page__body">
-        {warning ? <div className="settings-tab__error">{warning}</div> : null}
+        {errorInSettings ? (
+          <div className="settings-tab__error">{errorInSettings}</div>
+        ) : null}
         {this.renderStateLogs()}
         {this.renderResetAccount()}
         {this.renderToggleStxOptIn()}
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index 2c64b79e4f4d..aa5dc11ace89 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -1,15 +1,17 @@
 import React from 'react';
-import { fireEvent } from '@testing-library/react';
+import { fireEvent, waitFor } from '@testing-library/react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { exportAsFile } from '../../../helpers/utils/export-utils';
 import AdvancedTab from '.';
 
 const mockSetAutoLockTimeLimit = jest.fn().mockReturnValue({ type: 'TYPE' });
 const mockSetShowTestNetworks = jest.fn();
 const mockSetShowFiatConversionOnTestnetsPreference = jest.fn();
 const mockSetStxPrefEnabled = jest.fn();
+const mockDisplayErrorInSettings = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => {
   return {
@@ -21,6 +23,32 @@ jest.mock('../../../store/actions.ts', () => {
   };
 });
 
+jest.mock('../../../ducks/app/app.ts', () => ({
+  displayErrorInSettings: () => mockDisplayErrorInSettings,
+  hideErrorInSettings: () => jest.fn(),
+}));
+
+jest.mock('../../../helpers/utils/export-utils', () => ({
+  ...jest.requireActual('../../../helpers/utils/export-utils'),
+  exportAsFile: jest
+    .fn()
+    .mockResolvedValueOnce({})
+    .mockImplementationOnce(new Error('state file error')),
+}));
+
+jest.mock('webextension-polyfill', () => ({
+  runtime: {
+    getPlatformInfo: jest.fn().mockResolvedValue('mac'),
+  },
+}));
+
+Object.defineProperty(window, 'stateHooks', {
+  value: {
+    getCleanAppState: () => mockState,
+    getLogs: () => [],
+  },
+});
+
 describe('AdvancedTab Component', () => {
   const mockStore = configureMockStore([thunk])(mockState);
 
@@ -105,4 +133,33 @@ describe('AdvancedTab Component', () => {
       expect(mockSetStxPrefEnabled).toHaveBeenCalled();
     });
   });
+
+  describe('renderStateLogs', () => {
+    it('should render the toggle button for state log download', () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const stateLogButton = queryByTestId('advanced-setting-state-logs');
+      expect(stateLogButton).toBeInTheDocument();
+    });
+
+    it('should call exportAsFile when the toggle button is clicked', async () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const stateLogButton = queryByTestId(
+        'advanced-setting-state-logs-button',
+      );
+      fireEvent.click(stateLogButton);
+      await waitFor(() => {
+        expect(exportAsFile).toHaveBeenCalledTimes(1);
+      });
+    });
+    it('should call displayErrorInSettings when the state file download fails', async () => {
+      const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+      const stateLogButton = queryByTestId(
+        'advanced-setting-state-logs-button',
+      );
+      fireEvent.click(stateLogButton);
+      await waitFor(() => {
+        expect(mockDisplayErrorInSettings).toHaveBeenCalledTimes(1);
+      });
+    });
+  });
 });
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index f2ad894d1e8b..aaa094e0655c 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -5,7 +5,6 @@ import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../../shared/constants/prefe
 import { getPreferences } from '../../../selectors';
 import {
   backupUserData,
-  displayWarning,
   setAutoLockTimeLimit,
   setDismissSeedBackUpReminder,
   setFeatureFlag,
@@ -17,11 +16,15 @@ import {
   showModal,
 } from '../../../store/actions';
 import { getSmartTransactionsPreferenceEnabled } from '../../../../shared/modules/selectors';
+import {
+  displayErrorInSettings,
+  hideErrorInSettings,
+} from '../../../ducks/app/app';
 import AdvancedTab from './advanced-tab.component';
 
 export const mapStateToProps = (state) => {
   const {
-    appState: { warning },
+    appState: { errorInSettings },
     metamask,
   } = state;
   const {
@@ -37,7 +40,7 @@ export const mapStateToProps = (state) => {
   } = getPreferences(state);
 
   return {
-    warning,
+    errorInSettings,
     sendHexData,
     showFiatInTestnets,
     showTestNetworks,
@@ -54,7 +57,9 @@ export const mapDispatchToProps = (dispatch) => {
     backupUserData: () => backupUserData(),
     setHexDataFeatureFlag: (shouldShow) =>
       dispatch(setFeatureFlag('sendHexData', shouldShow)),
-    displayWarning: (warning) => dispatch(displayWarning(warning)),
+    displayErrorInSettings: (errorInSettings) =>
+      dispatch(displayErrorInSettings(errorInSettings)),
+    hideErrorInSettings: () => dispatch(hideErrorInSettings()),
     showResetAccountConfirmationModal: () =>
       dispatch(showModal({ name: 'CONFIRM_RESET_ACCOUNT' })),
     setUseNonceField: (value) => dispatch(setUseNonceField(value)),
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.stories.js b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
index 46e7ee978f43..36c84cbba8c0 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.stories.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
@@ -22,7 +22,8 @@ export default {
     setDismissSeedBackUpReminder: { action: 'setDismissSeedBackUpReminder' },
     setUseNonceField: { action: 'setUseNonceField' },
     setHexDataFeatureFlag: { action: 'setHexDataFeatureFlag' },
-    displayWarning: { action: 'displayWarning' },
+    displayErrorInSettings: { action: 'displayErrorInSettings' },
+    hideErrorInSettings: { action: 'hideErrorInSettings' },
     history: { action: 'history' },
     showResetAccountConfirmationModal: {
       action: 'showResetAccountConfirmationModal',
diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts
index 6f8080e516ae..2e31c6c7dd7f 100644
--- a/ui/store/actionConstants.ts
+++ b/ui/store/actionConstants.ts
@@ -49,6 +49,8 @@ export const LOCK_METAMASK = 'LOCK_METAMASK';
 // error handling
 export const DISPLAY_WARNING = 'DISPLAY_WARNING';
 export const HIDE_WARNING = 'HIDE_WARNING';
+export const SHOW_SETTINGS_PAGE_ERROR = 'SHOW_SETTINGS_PAGE_ERROR';
+export const HIDE_SETTINGS_PAGE_ERROR = 'HIDE_SETTINGS_PAGE_ERROR';
 export const CAPTURE_SINGLE_EXCEPTION = 'CAPTURE_SINGLE_EXCEPTION';
 // accounts screen
 export const SHOW_ACCOUNTS_PAGE = 'SHOW_ACCOUNTS_PAGE';

From 2de414e3f6bef968b4cd43ae2fba48ef79489590 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Fri, 1 Nov 2024 11:18:00 -0700
Subject: [PATCH 004/111] chore: remove broken link in docs (#28232)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR removes a broken link from the README that was originally
intended to point to the `Box` component in Storybook. While the link
works in Storybook, it does not function correctly when viewed directly
on GitHub or in code editors, leading to potential confusion. To
simplify access, we are removing this link; users can still locate the
`Box` component by searching for it directly within Storybook.

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. View the README file on GitHub.
2. Confirm that the broken link has been removed.
3. Check that references to the `Box` component remain understandable
without the link.

## **Screenshots/Recordings**

### **Before**


https://github.com/user-attachments/assets/d48cf851-163c-4169-a2f6-b0020ba79b8d

### **After**


https://github.com/user-attachments/assets/46d1f0b1-a2fa-4130-b726-460524118969

No more link references in code base

<img width="300" alt="Screenshot 2024-10-31 at 4 00 15 PM"
src="https://github.com/user-attachments/assets/0857dfc2-17d3-4aae-9250-7282e4107e7b">


## **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)).

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g., pulled and built the branch,
reviewed the updated README).
- [ ] 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/README.md       | 2 +-
 ui/components/component-library/text/README.mdx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/components/component-library/README.md b/ui/components/component-library/README.md
index ec5006d3491f..a1f865bfe95a 100644
--- a/ui/components/component-library/README.md
+++ b/ui/components/component-library/README.md
@@ -4,7 +4,7 @@ This folder contains design system components that are built 1:1 with the Figma
 
 ## Architecture
 
-All components are built on top of the `Box` component and accept all `Box` [component props](/docs/components-componentlibrary-box--docs#props).
+All components are built on top of the `Box` component and accept all `Box` component props.
 
 ### Layout
 
diff --git a/ui/components/component-library/text/README.mdx b/ui/components/component-library/text/README.mdx
index 5b275aa48e23..183fcbbca9f8 100644
--- a/ui/components/component-library/text/README.mdx
+++ b/ui/components/component-library/text/README.mdx
@@ -580,7 +580,7 @@ Values using the `TextAlign` object from `./ui/helpers/constants/design-system.j
 
 ### Box Props
 
-Box props are now integrated with the `Text` component. Valid Box props: [Box](/docs/components-componentlibrary-box--docs#props)
+Box props are now integrated with the `Text` component.
 
 You no longer need to pass these props as an object through `boxProps`
 

From 59044a48787bdc4ffbb105219b8c74f59e60befa Mon Sep 17 00:00:00 2001
From: Victor Thomas <10986371+vthomas13@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:52:31 -0400
Subject: [PATCH 005/111] chore: Adding installType to Sentry Tags for easy
 filtering (#28084)
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**
InstallType is a recently added flag to help quickly determine whether a
Sentry issue is coming from a natural webstore install, or a developer
environment. We want to be able to filter by this flag in the Sentry UI.

Added the tag, but also simplified some previous logic from when I added
extensionId to make adding extra attributes less tedious in the future.
We can also use this pattern for tags.
<!--
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/28084?quickstart=1)

## **Related issues**

Fixes: #27667

## **Manual testing steps**

1. Open App
2. Use developer options to trigger a sentry error
3. Go into Sentry UI and verify that installType is a tag in addition to
being in the extra properties.

## **Screenshots/Recordings**
<img width="320" alt="Screenshot 2024-10-24 at 1 04 59 PM"
src="https://github.com/user-attachments/assets/3ff828a5-c218-4222-9681-9001193380a0">
<!-- 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
- [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: Harika <153644847+hjetpoluru@users.noreply.github.com>
---
 app/scripts/lib/setupSentry.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 1b9e9f4ddbfc..354bb0bbb620 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -424,12 +424,17 @@ export function rewriteReport(report) {
     if (!report.extra) {
       report.extra = {};
     }
-
-    report.extra.appState = appState;
-    if (browser.runtime && browser.runtime.id) {
-      report.extra.extensionId = browser.runtime.id;
+    if (!report.tags) {
+      report.tags = {};
     }
-    report.extra.installType = installType;
+
+    Object.assign(report.extra, {
+      appState,
+      installType,
+      extensionId: browser.runtime?.id,
+    });
+
+    report.tags.installType = installType;
   } catch (err) {
     log('Error rewriting report', err);
   }

From a94de6a93d583325b46166bcb7a7e2ac84f9f38a Mon Sep 17 00:00:00 2001
From: Niranjana Binoy <43930900+NiranjanaBinoy@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:13:10 -0400
Subject: [PATCH 006/111] fix: Removing `warning` prop from settings (#27990)
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**
Even though `warning` property is still used in the setting-tab and
security-tab, we are no longer using `displayWarning` to update the
error from the settings. This makes the error displayed in the tabs
irrelevant to the component. So with this PR we are removing the warning
property from settings-tab and security-tab.
We are removing the warning property from advance-tab in
https://github.com/MetaMask/metamask-extension/pull/26999
<!--
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/27990?quickstart=1)

## **Related issues**

Related to https://github.com/MetaMask/metamask-extension/issues/25838

## **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**
<img width="1444" alt="Screenshot 2024-11-01 at 9 52 31 AM"
src="https://github.com/user-attachments/assets/18ffe6ef-670c-42f6-94ad-d2c0444996ec">

<img width="1376" alt="Screenshot 2024-11-01 at 9 52 07 AM"
src="https://github.com/user-attachments/assets/1767a3be-b0fe-40a7-9c6d-def6b35a5f0c">

<img width="1389" alt="Screenshot 2024-11-01 at 9 52 19 AM"
src="https://github.com/user-attachments/assets/0a3cae3f-9215-4d76-8530-debb76a01f54">

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

### **After**
<img width="1409" alt="Screenshot 2024-11-01 at 10 20 47 AM"
src="https://github.com/user-attachments/assets/2e27563d-baa2-4d33-a30b-5d16bf292bf5">

<img width="1316" alt="Screenshot 2024-11-01 at 10 21 23 AM"
src="https://github.com/user-attachments/assets/3618ce07-da3a-48de-a0d4-e0768a2aaa85">
<img width="1542" alt="Screenshot 2024-11-01 at 10 21 14 AM"
src="https://github.com/user-attachments/assets/866730ae-d6dd-4684-ba35-dd2cb34e2b7c">

<!-- [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>
Co-authored-by: Danica Shen <zhaodanica@gmail.com>
---
 .../security-tab/__snapshots__/security-tab.test.js.snap    | 5 -----
 ui/pages/settings/security-tab/security-tab.component.js    | 4 ----
 ui/pages/settings/security-tab/security-tab.container.js    | 6 +-----
 ui/pages/settings/security-tab/security-tab.test.js         | 2 --
 ui/pages/settings/settings-tab/settings-tab.component.js    | 4 ----
 ui/pages/settings/settings-tab/settings-tab.container.js    | 6 +-----
 6 files changed, 2 insertions(+), 25 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 dcec71767fe6..0927d04f89cb 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
@@ -83,11 +83,6 @@ exports[`Security Tab should match snapshot 1`] = `
         </label>
       </div>
     </div>
-    <div
-      class="settings-tab__error"
-    >
-      warning
-    </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 1fae729d3f31..f9e854ff2465 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -64,7 +64,6 @@ export default class SecurityTab extends PureComponent {
   };
 
   static propTypes = {
-    warning: PropTypes.string,
     history: PropTypes.object,
     openSeaEnabled: PropTypes.bool,
     setOpenSeaEnabled: PropTypes.func,
@@ -1131,7 +1130,6 @@ export default class SecurityTab extends PureComponent {
 
   render() {
     const {
-      warning,
       petnamesEnabled,
       dataCollectionForMarketing,
       setDataCollectionForMarketing,
@@ -1144,8 +1142,6 @@ export default class SecurityTab extends PureComponent {
         {showDataCollectionDisclaimer
           ? this.renderDataCollectionWarning()
           : null}
-
-        {warning && <div className="settings-tab__error">{warning}</div>}
         <span className="settings-page__security-tab-sub-header__bold">
           {this.context.t('security')}
         </span>
diff --git a/ui/pages/settings/security-tab/security-tab.container.js b/ui/pages/settings/security-tab/security-tab.container.js
index fa529c1ad3df..676a53097d4a 100644
--- a/ui/pages/settings/security-tab/security-tab.container.js
+++ b/ui/pages/settings/security-tab/security-tab.container.js
@@ -32,10 +32,7 @@ import { openBasicFunctionalityModal } from '../../../ducks/app/app';
 import SecurityTab from './security-tab.component';
 
 const mapStateToProps = (state) => {
-  const {
-    appState: { warning },
-    metamask,
-  } = state;
+  const { metamask } = state;
 
   const petnamesEnabled = getPetnamesEnabled(state);
 
@@ -60,7 +57,6 @@ const mapStateToProps = (state) => {
   const networkConfigurations = getNetworkConfigurationsByChainId(state);
 
   return {
-    warning,
     incomingTransactionsPreferences,
     networkConfigurations,
     participateInMetaMetrics,
diff --git a/ui/pages/settings/security-tab/security-tab.test.js b/ui/pages/settings/security-tab/security-tab.test.js
index 1685c5417151..ac93efc2e324 100644
--- a/ui/pages/settings/security-tab/security-tab.test.js
+++ b/ui/pages/settings/security-tab/security-tab.test.js
@@ -48,8 +48,6 @@ jest.mock('../../../ducks/app/app.ts', () => {
 });
 
 describe('Security Tab', () => {
-  mockState.appState.warning = 'warning'; // This tests an otherwise untested render branch
-
   const mockStore = configureMockStore([thunk])(mockState);
 
   function renderWithProviders(ui, store) {
diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js
index 191bbbc78685..6d56cd9ae10b 100644
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@@ -57,7 +57,6 @@ export default class SettingsTab extends PureComponent {
   static propTypes = {
     setUseBlockie: PropTypes.func,
     setCurrentCurrency: PropTypes.func,
-    warning: PropTypes.string,
     updateCurrentLocale: PropTypes.func,
     currentLocale: PropTypes.string,
     useBlockie: PropTypes.bool,
@@ -429,11 +428,8 @@ export default class SettingsTab extends PureComponent {
   }
 
   render() {
-    const { warning } = this.props;
-
     return (
       <div className="settings-page__body">
-        {warning ? <div className="settings-tab__error">{warning}</div> : null}
         {this.renderCurrentConversion()}
         {this.renderShowNativeTokenAsMainBalance()}
         {this.renderCurrentLocale()}
diff --git a/ui/pages/settings/settings-tab/settings-tab.container.js b/ui/pages/settings/settings-tab/settings-tab.container.js
index 7de17ffefde4..e6ad25f0df92 100644
--- a/ui/pages/settings/settings-tab/settings-tab.container.js
+++ b/ui/pages/settings/settings-tab/settings-tab.container.js
@@ -18,10 +18,7 @@ import { getProviderConfig } from '../../../ducks/metamask/metamask';
 import SettingsTab from './settings-tab.component';
 
 const mapStateToProps = (state) => {
-  const {
-    appState: { warning },
-    metamask,
-  } = state;
+  const { metamask } = state;
   const { currentCurrency, useBlockie, currentLocale } = metamask;
   const { ticker: nativeCurrency } = getProviderConfig(state);
   const { address: selectedAddress } = getSelectedInternalAccount(state);
@@ -31,7 +28,6 @@ const mapStateToProps = (state) => {
   const tokenList = getTokenList(state);
 
   return {
-    warning,
     currentLocale,
     currentCurrency,
     nativeCurrency,

From db2e8be23acd9bbf09ef700f647c1b759b9f2aba Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 1 Nov 2024 17:42:49 -0230
Subject: [PATCH 007/111] chore: Remove obsolete preview build support (#27968)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

We had previously configured CI to support installing `@metamask`-
scoped packages from the GitHub npm registry, as we used this registry
for "preview builds" from the core repository in the past. This is no
longer used; we publish preview builds to npm now instead. The obsolete
CI changes have been removed.

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

## **Related issues**

* [Preview build
instructions](https://github.com/MetaMask/core/blob/main/docs/contributing.md#testing-changes-to-packages-with-preview-builds)
([permalink](https://github.com/MetaMask/core/blob/56efd1d13a8873a5abb9bd9880d0576148b9d1e4/docs/contributing.md#testing-changes-to-packages-with-preview-builds))
* Preview build related extension PRs: #16547, #19970, #20096, #20312


## **Manual testing steps**

This is not anticipated to have any functional impact. If it does break
something, it would be the install step, so we can test this by
installing locally (and seeing that the install step succeeded on CI).

## **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 +-
 .circleci/scripts/install-dependencies.sh | 42 -----------------------
 .yarnrc.yml                               |  8 -----
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100755 .circleci/scripts/install-dependencies.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3836d5e4048e..aa13dea93b75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -444,7 +444,7 @@ jobs:
       - gh/install
       - run:
           name: Install dependencies
-          command: .circleci/scripts/install-dependencies.sh
+          command: yarn --immutable
       - save_cache:
           key: dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
           paths:
diff --git a/.circleci/scripts/install-dependencies.sh b/.circleci/scripts/install-dependencies.sh
deleted file mode 100755
index 35b7a690fa0c..000000000000
--- a/.circleci/scripts/install-dependencies.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-IS_NON_FORK_DRAFT='false'
-
-if [[ -n $CIRCLE_PULL_REQUEST ]] && gh auth status
-then
-  PR_NUMBER="${CIRCLE_PULL_REQUEST##*/}"
-  if [ -n "$PR_NUMBER" ]
-  then
-    IS_NON_FORK_DRAFT="$(gh pr view --json isDraft --jq '.isDraft' "$PR_NUMBER")"
-  fi
-fi
-
-# Build query to see whether there are any "preview-like" packages in the manifest
-# A "preview-like" package is a `@metamask`-scoped package with a prerelease version that has no period.
-QUERY='.dependencies + .devDependencies'                            # Get list of all dependencies
-QUERY+=' | with_entries( select(.key | startswith("@metamask") ) )' # filter to @metamask-scoped packages
-QUERY+=' | to_entries[].value'                                      # Get version ranges
-QUERY+=' | select(test("^\\d+\\.\\d+\\.\\d+-[^.]+$"))'              # Get pinned versions where the prerelease part has no "."
-
-# Use `-e` flag so that exit code indicates whether any matches were found
-if jq -e "${QUERY}" < ./package.json
-then
-  echo "Preview builds detected"
-  HAS_PREVIEW_BUILDS='true'
-else
-  echo "No preview builds detected"
-  HAS_PREVIEW_BUILDS='false'
-fi
-
-if [[ $IS_NON_FORK_DRAFT == 'true' && $HAS_PREVIEW_BUILDS == 'true' ]]
-then
-  # Use GitHub registry on draft PRs, allowing the use of preview builds
-  echo "Installing with preview builds"
-  METAMASK_NPM_REGISTRY=https://npm.pkg.github.com yarn --immutable
-else
-  echo "Installing without preview builds"
-  yarn --immutable
-fi
diff --git a/.yarnrc.yml b/.yarnrc.yml
index cc0c959e2722..8e12d8037c6a 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -119,14 +119,6 @@ npmAuditIgnoreAdvisories:
   - 'react-beautiful-dnd (deprecation)'
   # New package name format for new versions: @ethereumjs/wallet.
   - 'ethereumjs-wallet (deprecation)'
-npmRegistries:
-  'https://npm.pkg.github.com':
-    npmAlwaysAuth: true
-    npmAuthToken: '${GITHUB_PACKAGE_READ_TOKEN-}'
-
-npmScopes:
-  metamask:
-    npmRegistryServer: '${METAMASK_NPM_REGISTRY:-https://registry.yarnpkg.com}'
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs

From d773dd695dd1585d2b1afaf8d3ddd21b0e54785a Mon Sep 17 00:00:00 2001
From: Bryan Fullam <bryan.fullam@consensys.net>
Date: Sat, 2 Nov 2024 09:18:07 +0100
Subject: [PATCH 008/111] feat: add token verification source count and link to
 block explorer (#27759)
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 a previous redesign, the information about the number of sources a
token has been verified on and the link to that token on the relevant
block explorer was removed from the swap page. This returns that
information.

<!--
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/27759?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to the swap page
2. Select swap assets and amount
3. See token verification info and block explorer link

## **Screenshots/Recordings**

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

### **Before**
![Screenshot 2024-10-10 at 14 30
01](https://github.com/user-attachments/assets/85a3281e-a7b2-4649-9a72-7f756b233214)


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

### **After**
![Screenshot 2024-10-10 at 14 30
21](https://github.com/user-attachments/assets/6f557ed5-a956-4ab8-b3bd-957ac4d9fc2a)

<!-- [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/_locales/en/messages.json                 |  4 +
 shared/constants/common.ts                    | 54 ++++++++++++
 shared/constants/swaps.ts                     | 29 -------
 .../assets/nfts/nft-details/nft-details.tsx   |  4 +-
 .../account-list/account-list.tsx             |  4 +-
 ...nteractive-replacement-token-page.test.tsx |  4 +-
 .../interactive-replacement-token-page.tsx    |  4 +-
 ui/pages/swaps/awaiting-swap/awaiting-swap.js |  4 +-
 .../prepare-swap-page/prepare-swap-page.js    | 83 +++++++++++++------
 .../prepare-swap-page.test.js                 | 12 +--
 .../item-list/item-list.component.js          |  4 +-
 .../smart-transaction-status.js               |  4 +-
 12 files changed, 136 insertions(+), 74 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 512eb3b0ee36..cc077810750b 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -5876,6 +5876,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Potentially inauthentic token"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Confirmed by $1 sources. Verify on $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 allows up to $2 decimals",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
diff --git a/shared/constants/common.ts b/shared/constants/common.ts
index f45ec8abd7e4..96d2b0c65b55 100644
--- a/shared/constants/common.ts
+++ b/shared/constants/common.ts
@@ -1,5 +1,59 @@
+import { CHAIN_IDS } from './network';
+
 export enum EtherDenomination {
   ETH = 'ETH',
   GWEI = 'GWEI',
   WEI = 'WEI',
 }
+
+const BSC_DEFAULT_BLOCK_EXPLORER_URL = 'https://bscscan.com/';
+const BSC_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'BscScan';
+const MAINNET_DEFAULT_BLOCK_EXPLORER_URL = 'https://etherscan.io/';
+const MAINNET_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'Etherscan';
+const GOERLI_DEFAULT_BLOCK_EXPLORER_URL = 'https://goerli.etherscan.io/';
+const GOERLI_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'Goerli Etherscan';
+const POLYGON_DEFAULT_BLOCK_EXPLORER_URL = 'https://polygonscan.com/';
+const POLYGON_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'PolygonScan';
+const AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL = 'https://snowtrace.io/';
+const AVALANCHE_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'Snowtrace';
+const OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL = 'https://optimistic.etherscan.io/';
+const OPTIMISM_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'Optimism Explorer';
+const ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL = 'https://arbiscan.io/';
+const ARBITRUM_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'ArbiScan';
+const ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL = 'https://explorer.zksync.io/';
+const ZKSYNC_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'Zksync Explorer';
+const LINEA_DEFAULT_BLOCK_EXPLORER_URL = 'https://lineascan.build/';
+const LINEA_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'LineaScan';
+const BASE_DEFAULT_BLOCK_EXPLORER_URL = 'https://basescan.org/';
+const BASE_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL = 'BaseScan';
+
+type BlockExplorerUrlMap = {
+  [key: string]: string;
+};
+
+export const CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP: BlockExplorerUrlMap = {
+  [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
+  [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
+} as const;
+
+export const CHAINID_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL_MAP: BlockExplorerUrlMap =
+  {
+    [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+    [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL,
+  } as const;
diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts
index 3868c7b6e2f0..8dfecccef6e6 100644
--- a/shared/constants/swaps.ts
+++ b/shared/constants/swaps.ts
@@ -49,10 +49,6 @@ export type SwapsTokenObject = {
   iconUrl: string;
 };
 
-type BlockExplorerUrlMap = {
-  [key: string]: string;
-};
-
 export const ETH_SWAPS_TOKEN_OBJECT: SwapsTokenObject = {
   symbol: CURRENCY_SYMBOLS.ETH,
   name: 'Ether',
@@ -174,17 +170,6 @@ export const TOKEN_API_BASE_URL = 'https://tokens.api.cx.metamask.io';
 export const GAS_API_BASE_URL = 'https://gas.api.cx.metamask.io';
 export const GAS_DEV_API_BASE_URL = 'https://gas.uat-api.cx.metamask.io';
 
-const BSC_DEFAULT_BLOCK_EXPLORER_URL = 'https://bscscan.com/';
-export const MAINNET_DEFAULT_BLOCK_EXPLORER_URL = 'https://etherscan.io/';
-const GOERLI_DEFAULT_BLOCK_EXPLORER_URL = 'https://goerli.etherscan.io/';
-const POLYGON_DEFAULT_BLOCK_EXPLORER_URL = 'https://polygonscan.com/';
-const AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL = 'https://snowtrace.io/';
-const OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL = 'https://optimistic.etherscan.io/';
-const ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL = 'https://arbiscan.io/';
-const ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL = 'https://explorer.zksync.io/';
-export const LINEA_DEFAULT_BLOCK_EXPLORER_URL = 'https://lineascan.build/';
-const BASE_DEFAULT_BLOCK_EXPLORER_URL = 'https://basescan.org/';
-
 export const ALLOWED_PROD_SWAPS_CHAIN_IDS = [
   CHAIN_IDS.MAINNET,
   SWAPS_TESTNET_CHAIN_ID,
@@ -298,20 +283,6 @@ export const SWAPS_CHAINID_DEFAULT_TOKEN_MAP = {
   [CHAIN_IDS.BASE]: BASE_SWAPS_TOKEN_OBJECT,
 } as const;
 
-export const SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP: BlockExplorerUrlMap =
-  {
-    [CHAIN_IDS.BSC]: BSC_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.MAINNET]: MAINNET_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.POLYGON]: POLYGON_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.GOERLI]: GOERLI_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.AVALANCHE]: AVALANCHE_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.OPTIMISM]: OPTIMISM_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.ARBITRUM]: ARBITRUM_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.ZKSYNC_ERA]: ZKSYNC_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.LINEA_MAINNET]: LINEA_DEFAULT_BLOCK_EXPLORER_URL,
-    [CHAIN_IDS.BASE]: BASE_DEFAULT_BLOCK_EXPLORER_URL,
-  } as const;
-
 export const ETHEREUM = 'ethereum';
 export const POLYGON = 'polygon';
 export const BSC = 'bsc';
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 5ee8525cc98b..0dc9ec05250c 100644
--- a/ui/components/app/assets/nfts/nft-details/nft-details.tsx
+++ b/ui/components/app/assets/nfts/nft-details/nft-details.tsx
@@ -66,7 +66,7 @@ import { MetaMetricsContext } from '../../../../../contexts/metametrics';
 import { Content, Footer, Page } from '../../../../multichain/pages/page';
 import { formatCurrency } from '../../../../../helpers/utils/confirm-tx.util';
 import { getShortDateFormatterV2 } from '../../../../../pages/asset/util';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../../shared/constants/common';
 import { getConversionRate } from '../../../../../ducks/metamask/metamask';
 import { Numeric } from '../../../../../../shared/modules/Numeric';
 // TODO: Remove restricted import
@@ -277,7 +277,7 @@ export default function NftDetails({ nft }: { nft: Nft }) {
       null as unknown as string, // no holderAddress
       {
         blockExplorerUrl:
-          SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ?? null,
+          CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ?? null,
       },
     );
   };
diff --git a/ui/pages/institutional/account-list/account-list.tsx b/ui/pages/institutional/account-list/account-list.tsx
index e710a0e6e93a..84431f867307 100644
--- a/ui/pages/institutional/account-list/account-list.tsx
+++ b/ui/pages/institutional/account-list/account-list.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import CustodyLabels from '../../../components/institutional/custody-labels';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { shortenAddress } from '../../../helpers/utils/util';
 import Tooltip from '../../../components/ui/tooltip';
@@ -41,7 +41,7 @@ type CustodyAccountListProps = {
 };
 
 const getButtonLinkHref = (account: Account) => {
-  const url = SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET];
+  const url = CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET];
   return `${url}address/${account.address}`;
 };
 
diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.tsx b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.tsx
index b2db09b4d06c..6fca1af16a8e 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.tsx
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.test.tsx
@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom';
 import thunk from 'redux-thunk';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import mockState from '../../../../test/data/mock-state.json';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { shortenAddress } from '../../../helpers/utils/util';
 import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
@@ -145,7 +145,7 @@ describe('Interactive Replacement Token Page', function () {
 
   it('should render all the accounts correctly', async () => {
     const expectedHref = `${
-      SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET]
+      CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET]
     }address/${custodianAddress}`;
 
     await act(async () => {
diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
index 5c00eb4ffa10..c12bb0aedf57 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
@@ -29,7 +29,7 @@ import { getMetaMaskAccounts } from '../../../selectors';
 import { getInstitutionalConnectRequests } from '../../../ducks/institutional/institutional';
 import { getSelectedInternalAccount } from '../../../selectors/accounts';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import {
   mmiActionsFactory,
@@ -43,7 +43,7 @@ import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { shortenAddress } from '../../../helpers/utils/util';
 
 const getButtonLinkHref = ({ address }: { address: string }) => {
-  const url = SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET];
+  const url = CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[CHAIN_IDS.MAINNET];
   return `${url}address/${address}`;
 };
 
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 7c410ca03ce5..111af726acfa 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -48,8 +48,8 @@ import {
   QUOTES_NOT_AVAILABLE_ERROR,
   CONTRACT_DATA_DISABLED_ERROR,
   OFFLINE_FOR_MAINTENANCE,
-  SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP,
 } from '../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
 import { isSwapsDefaultTokenSymbol } from '../../../../shared/modules/swaps.utils';
 import PulseLoader from '../../../components/ui/pulse-loader';
 
@@ -143,7 +143,7 @@ export default function AwaitingSwap({
   };
   const baseNetworkUrl =
     rpcPrefs.blockExplorerUrl ??
-    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
+    CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
   const blockExplorerUrl = getBlockExplorerLink(
     { hash: txHash, chainId },
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 8a701289bebd..1e5eb5179e2c 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -2,9 +2,9 @@ import React, { useContext, useEffect, useState, useCallback } from 'react';
 import BigNumber from 'bignumber.js';
 import PropTypes from 'prop-types';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { uniqBy, isEqual } from 'lodash';
+import { uniqBy, isEqual, isEmpty } from 'lodash';
 import { useHistory } from 'react-router-dom';
-import { getTokenTrackerLink } from '@metamask/etherscan-link';
+import { getAccountLink, getTokenTrackerLink } from '@metamask/etherscan-link';
 import classnames from 'classnames';
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -83,23 +83,23 @@ import { usePrevious } from '../../../hooks/usePrevious';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
 import { useEthFiatAmount } from '../../../hooks/useEthFiatAmount';
-import {
-  isSwapsDefaultTokenAddress,
-  isSwapsDefaultTokenSymbol,
-} from '../../../../shared/modules/swaps.utils';
+import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventLinkType,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import {
-  SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP,
   TokenBucketPriority,
   ERROR_FETCHING_QUOTES,
   QUOTES_NOT_AVAILABLE_ERROR,
   QUOTES_EXPIRED_ERROR,
   MAX_ALLOWED_SLIPPAGE,
 } from '../../../../shared/constants/swaps';
+import {
+  CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP,
+  CHAINID_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL_MAP,
+} from '../../../../shared/constants/common';
 import {
   resetSwapsPostFetchState,
   ignoreTokens,
@@ -142,6 +142,7 @@ import SwapsBannerAlert from '../swaps-banner-alert/swaps-banner-alert';
 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 QuotesLoadingAnimation from './quotes-loading-animation';
 import ReviewQuote from './review-quote';
 
@@ -228,8 +229,8 @@ export default function PrepareSwapPage({
   const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
   const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
 
-  const fetchParamsFromToken = isSwapsDefaultTokenSymbol(
-    sourceTokenInfo?.symbol,
+  const fetchParamsFromToken = isSwapsDefaultTokenAddress(
+    sourceTokenInfo?.address,
     chainId,
   )
     ? defaultSwapsToken
@@ -241,7 +242,8 @@ export default function PrepareSwapPage({
   // but is not in tokensWithBalances or tokens, then we want to add it to the usersTokens array so that
   // the balance of the token can appear in the from token selection dropdown
   const fromTokenArray =
-    !isSwapsDefaultTokenSymbol(fromToken?.symbol, chainId) && fromToken?.balance
+    !isSwapsDefaultTokenAddress(fromToken?.address, chainId) &&
+    fromToken?.balance
       ? [fromToken]
       : [];
   const usersTokens = uniqBy(
@@ -310,7 +312,10 @@ export default function PrepareSwapPage({
     { showFiat: true },
     true,
   );
-  const swapFromFiatValue = isSwapsDefaultTokenSymbol(fromTokenSymbol, chainId)
+  const swapFromFiatValue = isSwapsDefaultTokenAddress(
+    fromTokenAddress,
+    chainId,
+  )
     ? swapFromEthFiatValue
     : swapFromTokenFiatValue;
 
@@ -435,19 +440,27 @@ export default function PrepareSwapPage({
     onInputChange(fromTokenInputValue, token.string, token.decimals);
   };
 
-  const blockExplorerTokenLink = getTokenTrackerLink(
-    selectedToToken.address,
-    chainId,
-    null, // no networkId
-    null, // no holderAddress
-    {
-      blockExplorerUrl:
-        SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ?? null,
-    },
-  );
+  const blockExplorerTokenLink =
+    chainId === CHAIN_IDS.ZKSYNC_ERA
+      ? // Use getAccountLink because zksync explorer uses a /address URL scheme instead of /token
+        getAccountLink(selectedToToken.address, chainId, {
+          blockExplorerUrl:
+            CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ?? null,
+        })
+      : getTokenTrackerLink(
+          selectedToToken.address,
+          chainId,
+          null, // no networkId
+          null, // no holderAddress
+          {
+            blockExplorerUrl:
+              CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ?? null,
+          },
+        );
 
   const blockExplorerLabel = rpcPrefs.blockExplorerUrl
-    ? getURLHostName(blockExplorerTokenLink)
+    ? CHAINID_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL_MAP[chainId] ??
+      t('etherscan')
     : t('etherscan');
 
   const { address: toAddress } = toToken || {};
@@ -786,18 +799,23 @@ export default function PrepareSwapPage({
     );
   }
 
-  const isNonDefaultToken = !isSwapsDefaultTokenSymbol(
-    fromTokenSymbol,
+  const isNonDefaultFromToken = !isSwapsDefaultTokenAddress(
+    fromTokenAddress,
     chainId,
   );
   const hasPositiveFromTokenBalance = rawFromTokenBalance > 0;
   const isTokenEligibleForMaxBalance =
-    isSmartTransaction || (!isSmartTransaction && isNonDefaultToken);
+    isSmartTransaction || (!isSmartTransaction && isNonDefaultFromToken);
   const showMaxBalanceLink =
     fromTokenSymbol &&
     isTokenEligibleForMaxBalance &&
     hasPositiveFromTokenBalance;
 
+  const isNonDefaultToToken = !isSwapsDefaultTokenAddress(
+    selectedToToken.address,
+    chainId,
+  );
+
   return (
     <div className="prepare-swap-page">
       <div className="prepare-swap-page__content">
@@ -1024,6 +1042,21 @@ export default function PrepareSwapPage({
               {selectedToToken?.string && yourTokenToBalance}
             </div>
           </Box>
+          <Box
+            display={DISPLAY.FLEX}
+            justifyContent={JustifyContent.spaceBetween}
+            alignItems={AlignItems.stretch}
+          >
+            <div className="prepare-swap-page__balance-message">
+              {selectedToToken &&
+                !isEmpty(selectedToToken) &&
+                isNonDefaultToToken &&
+                t('swapTokenVerifiedSources', [
+                  occurrences,
+                  <BlockExplorerLink key="block-explorer-link" />,
+                ])}
+            </div>
+          </Box>
         </div>
         {showCrossChainSwapsLink && (
           <ButtonLink
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.test.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.test.js
index a76160ef77bb..adb5b56ddd93 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.test.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.test.js
@@ -120,7 +120,7 @@ describe('PrepareSwapPage', () => {
       },
     });
     const props = createProps();
-    const { getByText } = renderWithProvider(
+    const { getByText, getAllByText } = renderWithProvider(
       <PrepareSwapPage {...props} />,
       store,
     );
@@ -128,7 +128,7 @@ describe('PrepareSwapPage', () => {
     expect(
       getByText('USDC is only verified on 1 source', { exact: false }),
     ).toBeInTheDocument();
-    expect(getByText('etherscan.io')).toBeInTheDocument();
+    expect(getAllByText('Etherscan')[0]).toBeInTheDocument();
     expect(getByText('Continue swapping')).toBeInTheDocument();
   });
 
@@ -143,7 +143,7 @@ describe('PrepareSwapPage', () => {
       },
     });
     const props = createProps();
-    const { getByText } = renderWithProvider(
+    const { getByText, getAllByText } = renderWithProvider(
       <PrepareSwapPage {...props} />,
       store,
     );
@@ -151,7 +151,7 @@ describe('PrepareSwapPage', () => {
     expect(
       getByText('Verify this token on', { exact: false }),
     ).toBeInTheDocument();
-    expect(getByText('etherscan.io')).toBeInTheDocument();
+    expect(getAllByText('Etherscan')[0]).toBeInTheDocument();
     expect(getByText('Continue swapping')).toBeInTheDocument();
   });
 
@@ -167,11 +167,11 @@ describe('PrepareSwapPage', () => {
       },
     });
     const props = createProps();
-    const { getByText } = renderWithProvider(
+    const { getAllByText } = renderWithProvider(
       <PrepareSwapPage {...props} />,
       store,
     );
-    const blockExplorer = getByText('etherscan.io');
+    const blockExplorer = getAllByText('Etherscan')[0];
     expect(blockExplorer).toBeInTheDocument();
     fireEvent.click(blockExplorer);
     expect(global.platform.openTab).toHaveBeenCalledWith({
diff --git a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
index 779d1edf58a8..bd1bb5aa5aaf 100644
--- a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
+++ b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
@@ -13,7 +13,7 @@ import {
   getUseCurrencyRateCheck,
 } from '../../../../selectors';
 import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../shared/constants/common';
 import { getURLHostName } from '../../../../helpers/utils/util';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 
@@ -35,7 +35,7 @@ export default function ItemList({
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
   const blockExplorerLink =
     rpcPrefs.blockExplorerUrl ??
-    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
+    CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const blockExplorerHostName = getURLHostName(blockExplorerLink);
diff --git a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
index 7b8d5910c218..d3127c9a94f3 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -23,7 +23,7 @@ import {
   getSmartTransactionsEnabled,
   getSmartTransactionsOptInStatusForMetrics,
 } from '../../../../shared/modules/selectors';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/common';
 import {
   DEFAULT_ROUTE,
   PREPARE_SWAP_ROUTE,
@@ -87,7 +87,7 @@ export default function SmartTransactionStatusPage() {
   );
   const baseNetworkUrl =
     rpcPrefs.blockExplorerUrl ??
-    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
+    CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
 
   let smartTransactionStatus = SmartTransactionStatus.pending;

From 5e28e36059dd50d6e6993f353a590a3886cc3a93 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Sun, 3 Nov 2024 23:09:54 -0800
Subject: [PATCH 009/111] fix: margin on asset chart min/max indicators
 (#27916)
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**

Design feedback that the min/max indicators on the asset chart should
not be edge to edge like the chart itself. They should have margin like
the rest of the content on the page.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Click on a token in the token list
2. Click various date range buttons
3. Verify min/max indicators on the chart are in right place
4. Verify min/max indicators keep 16px margin from the edges

## **Screenshots/Recordings**

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

### **Before**


![image](https://github.com/user-attachments/assets/1b319f18-277d-47a9-b3b2-90b854a58864)

### **After**


![image](https://github.com/user-attachments/assets/90a12c91-16cf-46b4-be91-c287d7d93bf8)

## **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.
---
 .../asset/components/__snapshots__/asset-page.test.tsx.snap   | 4 ++--
 ui/pages/asset/components/chart/chart-tooltip.tsx             | 2 ++
 2 files changed, 4 insertions(+), 2 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 79400367de13..b5ebc0a83eb6 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -764,7 +764,7 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
             style="padding-right: 100%; direction: rtl;"
           >
             <p
-              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-center mm-box--color-text-alternative"
+              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-center mm-box--margin-right-4 mm-box--margin-left-4 mm-box--color-text-alternative"
             >
               $1.00
             </p>
@@ -777,7 +777,7 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
             style="padding-right: 100%; direction: rtl;"
           >
             <p
-              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-center mm-box--color-text-alternative"
+              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-center mm-box--margin-right-4 mm-box--margin-left-4 mm-box--color-text-alternative"
             >
               $1.00
             </p>
diff --git a/ui/pages/asset/components/chart/chart-tooltip.tsx b/ui/pages/asset/components/chart/chart-tooltip.tsx
index ac7fbc3c20d4..4fa4b83a85ff 100644
--- a/ui/pages/asset/components/chart/chart-tooltip.tsx
+++ b/ui/pages/asset/components/chart/chart-tooltip.tsx
@@ -42,6 +42,8 @@ const ChartTooltip = ({
       }}
     >
       <Text
+        marginLeft={4}
+        marginRight={4}
         variant={TextVariant.bodySmMedium}
         color={TextColor.textAlternative}
         textAlign={TextAlign.Center}

From 3e1dd236690d29ab44fb66cb537f61a5a84ca2c1 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Mon, 4 Nov 2024 09:50:59 +0000
Subject: [PATCH 010/111] refactor: remove global network usage from signatures
 (#28167)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Remove global network usage from all signature components and hooks.

Specifically:

- Replace usages of the following selectors with the chain ID extracted
from the signature request.
  - `getCurrentChainId`
  - `getNativeCurrency`
  - `getProviderConfig`
- Add new selectors:
  - `selectNetworkConfigurationByChainId`
  - `selectDefaultRpcEndpointByChainId`

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

## **Related issues**

Fixes:
[#3375](https://github.com/MetaMask/MetaMask-planning/issues/3375)
[#3500](https://github.com/MetaMask/MetaMask-planning/issues/3500)
[#3459](https://github.com/MetaMask/MetaMask-planning/issues/3459)
[#3374](https://github.com/MetaMask/MetaMask-planning/issues/3374)

## **Manual testing steps**

Regression of all signature types including legacy and redesigned
confirmations.

Also verify Blockaid warnings.

## **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.
---
 test/data/confirmations/personal_sign.ts      |   4 +
 test/data/confirmations/typed_sign.ts         |  11 +-
 .../confirmations/signatures/permit.test.tsx  |   2 +
 .../signatures/personalSign.test.tsx          |   2 +
 ui/hooks/useName.test.ts                      |   1 -
 ui/hooks/useNftCollectionsMetadata.test.ts    |   4 -
 .../value-display/value-display.tsx           |   1 +
 .../network-change-toast-legacy.tsx           |  19 +-
 .../contract-details-modal.js                 |  10 +-
 .../blockaid-banner-alert.js                  |   6 +-
 .../signature-request-header.js               |  32 ++-
 .../signature-request-header.stories.js       |  17 ++
 .../signature-request-header.test.js          |  10 +-
 .../signature-request-original.stories.js     |  19 +-
 .../signature-request-original.test.js        |   7 +
 .../signature-request-siwe.test.js.snap       |   2 +-
 .../signature-request-siwe.stories.js         |  25 +-
 .../signature-request-siwe.test.js            |   8 +-
 .../signature-request.test.js.snap            |  41 ---
 .../signature-request/signature-request.js    |  16 +-
 .../signature-request.stories.js              |   8 +-
 .../signature-request.test.js                 | 269 ++++++++----------
 .../confirm-signature-request/index.test.js   |  13 +-
 .../hooks/alerts/useBlockaidAlerts.ts         |   6 +-
 .../hooks/useConfirmationNetworkInfo.ts       |  19 +-
 ...rackERC20WithoutDecimalInformation.test.ts |   3 +-
 .../useTrackERC20WithoutDecimalInformation.ts |   5 +-
 ui/selectors/selectors.js                     |  22 ++
 28 files changed, 307 insertions(+), 275 deletions(-)

diff --git a/test/data/confirmations/personal_sign.ts b/test/data/confirmations/personal_sign.ts
index b0f135efa53d..69c3ff9f75bc 100644
--- a/test/data/confirmations/personal_sign.ts
+++ b/test/data/confirmations/personal_sign.ts
@@ -1,3 +1,4 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { SignatureRequestType } from '../../../ui/pages/confirmations/types/confirm';
 
 export const PERSONAL_SIGN_SENDER_ADDRESS =
@@ -5,6 +6,7 @@ export const PERSONAL_SIGN_SENDER_ADDRESS =
 
 export const unapprovedPersonalSignMsg = {
   id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
+  chainId: CHAIN_IDS.GOERLI,
   status: 'unapproved',
   time: new Date().getTime(),
   type: 'personal_sign',
@@ -20,6 +22,7 @@ export const unapprovedPersonalSignMsg = {
 
 export const signatureRequestSIWE = {
   id: '210ca3b0-1ccb-11ef-b096-89c4d726ebb5',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -57,6 +60,7 @@ export const signatureRequestSIWE = {
 
 export const SignatureRequestSIWEWithResources = {
   id: '210ca3b0-1ccb-11ef-b096-89c4d726ebb5',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
diff --git a/test/data/confirmations/typed_sign.ts b/test/data/confirmations/typed_sign.ts
index 7be24a1389c6..831d561f0cb2 100644
--- a/test/data/confirmations/typed_sign.ts
+++ b/test/data/confirmations/typed_sign.ts
@@ -1,9 +1,10 @@
-import { TransactionType } from '@metamask/transaction-controller';
+import { CHAIN_IDS, TransactionType } from '@metamask/transaction-controller';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import { SignatureRequestType } from '../../../ui/pages/confirmations/types/confirm';
 
 export const unapprovedTypedSignMsgV1 = {
   id: '82ab2400-e2c6-11ee-9627-73cc88f00492',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -60,6 +61,7 @@ const rawMessageV3 = {
 
 export const unapprovedTypedSignMsgV3 = {
   id: '17e41af0-e073-11ee-9eec-5fd284826685',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -129,6 +131,7 @@ export const rawMessageV4 = {
 
 export const unapprovedTypedSignMsgV4 = {
   id: '0050d5b0-c023-11ee-a0cb-3390a510a0ab',
+  chainId: CHAIN_IDS.GOERLI,
   status: 'unapproved',
   time: new Date().getTime(),
   chainid: '0x5',
@@ -145,6 +148,7 @@ export const unapprovedTypedSignMsgV4 = {
 
 export const orderSignatureMsg = {
   id: 'e5249ae0-4b6b-11ef-831f-65b48eb489ec',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     result_type: 'loading',
     reason: 'validation_in_progress',
@@ -165,6 +169,7 @@ export const orderSignatureMsg = {
 
 export const permitSignatureMsg = {
   id: '0b1787a0-1c44-11ef-b70d-e7064bd7b659',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -185,6 +190,7 @@ export const permitSignatureMsg = {
 
 export const permitNFTSignatureMsg = {
   id: 'c5067710-87cf-11ef-916c-71f266571322',
+  chainId: CHAIN_IDS.GOERLI,
   status: 'unapproved',
   time: 1728651190529,
   type: 'eth_signTypedData',
@@ -200,6 +206,7 @@ export const permitNFTSignatureMsg = {
 
 export const permitSignatureMsgWithNoDeadline = {
   id: '0b1787a0-1c44-11ef-b70d-e7064bd7b659',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -219,6 +226,7 @@ export const permitSignatureMsgWithNoDeadline = {
 
 export const permitBatchSignatureMsg = {
   id: '0b1787a0-1c44-11ef-b70d-e7064bd7b659',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
@@ -239,6 +247,7 @@ export const permitBatchSignatureMsg = {
 
 export const permitSingleSignatureMsg = {
   id: '0b1787a0-1c44-11ef-b70d-e7064bd7b659',
+  chainId: CHAIN_IDS.GOERLI,
   securityAlertResponse: {
     reason: 'loading',
     result_type: 'validation_in_progress',
diff --git a/test/integration/confirmations/signatures/permit.test.tsx b/test/integration/confirmations/signatures/permit.test.tsx
index 8e9c979562f2..5ff87bf7c533 100644
--- a/test/integration/confirmations/signatures/permit.test.tsx
+++ b/test/integration/confirmations/signatures/permit.test.tsx
@@ -1,6 +1,7 @@
 import { ApprovalType } from '@metamask/controller-utils';
 import { act, fireEvent, screen, waitFor } from '@testing-library/react';
 import nock from 'nock';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { MESSAGE_TYPE } from '../../../../shared/constants/app';
 import {
   MetaMetricsEventCategory,
@@ -42,6 +43,7 @@ const getMetaMaskStateWithUnapprovedPermitSign = (accountAddress: string) => {
     unapprovedTypedMessages: {
       [pendingPermitId]: {
         id: pendingPermitId,
+        chainId: CHAIN_IDS.SEPOLIA,
         status: 'unapproved',
         time: pendingPermitTime,
         type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
diff --git a/test/integration/confirmations/signatures/personalSign.test.tsx b/test/integration/confirmations/signatures/personalSign.test.tsx
index 690446caa533..5a9c311c9abd 100644
--- a/test/integration/confirmations/signatures/personalSign.test.tsx
+++ b/test/integration/confirmations/signatures/personalSign.test.tsx
@@ -1,5 +1,6 @@
 import { ApprovalType } from '@metamask/controller-utils';
 import { act, fireEvent, screen, waitFor } from '@testing-library/react';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { MESSAGE_TYPE } from '../../../../shared/constants/app';
 import {
   MetaMetricsEventCategory,
@@ -34,6 +35,7 @@ const getMetaMaskStateWithUnapprovedPersonalSign = (accountAddress: string) => {
     unapprovedPersonalMsgs: {
       [pendingPersonalSignId]: {
         id: pendingPersonalSignId,
+        chainId: CHAIN_IDS.SEPOLIA,
         status: 'unapproved',
         time: pendingPersonalSignTime,
         type: MESSAGE_TYPE.PERSONAL_SIGN,
diff --git a/ui/hooks/useName.test.ts b/ui/hooks/useName.test.ts
index f746c4bb6267..b102e9dce7a0 100644
--- a/ui/hooks/useName.test.ts
+++ b/ui/hooks/useName.test.ts
@@ -15,7 +15,6 @@ jest.mock('react-redux', () => ({
 }));
 
 jest.mock('../selectors', () => ({
-  getCurrentChainId: jest.fn(),
   getNames: jest.fn(),
 }));
 
diff --git a/ui/hooks/useNftCollectionsMetadata.test.ts b/ui/hooks/useNftCollectionsMetadata.test.ts
index e1e2b6745ad1..cf7997cb518b 100644
--- a/ui/hooks/useNftCollectionsMetadata.test.ts
+++ b/ui/hooks/useNftCollectionsMetadata.test.ts
@@ -16,10 +16,6 @@ jest.mock('react-redux', () => ({
   useSelector: (selector: any) => selector(),
 }));
 
-jest.mock('../selectors', () => ({
-  getCurrentChainId: jest.fn(),
-}));
-
 jest.mock('../store/actions', () => ({
   getNFTContractInfo: jest.fn(),
   getTokenStandardAndDetails: jest.fn(),
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
index fa0c911d5eae..c7a9eae6a496 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
@@ -59,6 +59,7 @@ const PermitSimulationValueDisplay: React.FC<
 
   const tokenDetails = useGetTokenStandardAndDetails(tokenContract);
   useTrackERC20WithoutDecimalInformation(
+    chainId,
     tokenContract,
     tokenDetails as TokenDetailsERC20,
     MetaMetricsEventLocation.SignatureConfirmation,
diff --git a/ui/pages/confirmations/components/confirm/network-change-toast/network-change-toast-legacy.tsx b/ui/pages/confirmations/components/confirm/network-change-toast/network-change-toast-legacy.tsx
index fca355a9b063..f8d6b87e50db 100644
--- a/ui/pages/confirmations/components/confirm/network-change-toast/network-change-toast-legacy.tsx
+++ b/ui/pages/confirmations/components/confirm/network-change-toast/network-change-toast-legacy.tsx
@@ -1,18 +1,14 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
-import { Hex } from '@metamask/utils';
 import { Box } from '../../../../../components/component-library';
 import { Toast } from '../../../../../components/multichain';
 import {
   getLastInteractedConfirmationInfo,
   setLastInteractedConfirmationInfo,
 } from '../../../../../store/actions';
-import {
-  getCurrentChainId,
-  getNetworkConfigurationsByChainId,
-} from '../../../../../selectors';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { selectNetworkConfigurationByChainId } from '../../../../../selectors';
 
 const CHAIN_CHANGE_THRESHOLD_MILLISECONDS = 60 * 1000; // 1 Minute
 const TOAST_TIMEOUT_MILLISECONDS = 5 * 1000; // 5 Seconds
@@ -22,12 +18,13 @@ const NetworkChangeToastLegacy = ({
 }: {
   confirmation: { id: string; chainId: string };
 }) => {
-  const chainId = useSelector(getCurrentChainId);
-  const newChainId = confirmation?.chainId ?? chainId;
+  const newChainId = confirmation?.chainId;
   const [toastVisible, setToastVisible] = useState(false);
   const t = useI18nContext();
-  const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
-  const network = networkConfigurations[newChainId as Hex];
+
+  const network = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, newChainId),
+  );
 
   const hideToast = useCallback(() => {
     setToastVisible(false);
@@ -35,9 +32,11 @@ const NetworkChangeToastLegacy = ({
 
   useEffect(() => {
     let isMounted = true;
+
     if (!confirmation) {
       return undefined;
     }
+
     (async () => {
       const lastInteractedConfirmationInfo =
         await getLastInteractedConfirmationInfo();
@@ -71,7 +70,7 @@ const NetworkChangeToastLegacy = ({
     return () => {
       isMounted = false;
     };
-  }, [confirmation?.id, chainId]);
+  }, [confirmation?.id]);
 
   if (!toastVisible) {
     return null;
diff --git a/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js b/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
index a0a16cc838c3..795401673691 100644
--- a/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
+++ b/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
@@ -39,7 +39,7 @@ export default function ContractDetailsModal({
   tokenAddress,
   toAddress,
   chainId,
-  rpcPrefs,
+  blockExplorerUrl,
   tokenId,
   assetName,
   assetStandard,
@@ -178,7 +178,7 @@ export default function ContractDetailsModal({
                         tokenAddress,
                         chainId,
                         {
-                          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+                          blockExplorerUrl: blockExplorerUrl ?? null,
                         },
                         null,
                       );
@@ -287,7 +287,7 @@ export default function ContractDetailsModal({
                     toAddress,
                     chainId,
                     {
-                      blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+                      blockExplorerUrl: blockExplorerUrl ?? null,
                     },
                     null,
                   );
@@ -338,9 +338,9 @@ ContractDetailsModal.propTypes = {
    */
   chainId: PropTypes.string,
   /**
-   * RPC prefs of the current network
+   * Block explorer URL of the current network
    */
-  rpcPrefs: PropTypes.object,
+  blockExplorerUrl: PropTypes.string,
   /**
    * The token id of the NFT
    */
diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
index 4115f06cd644..ff5adfea8b5d 100644
--- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
+++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { captureException } from '@sentry/browser';
 import BlockaidPackage from '@blockaid/ppom_release/package.json';
 
-import { useSelector } from 'react-redux';
 import { NETWORK_TO_NAME_MAP } from '../../../../../../shared/constants/network';
 import { OverflowWrap } from '../../../../../helpers/constants/design-system';
 import { I18nContext } from '../../../../../contexts/i18n';
@@ -20,7 +19,6 @@ import { useTransactionEventFragment } from '../../../hooks/useTransactionEventF
 
 import SecurityProviderBannerAlert from '../security-provider-banner-alert';
 import LoadingIndicator from '../../../../../components/ui/loading-indicator';
-import { getCurrentChainId } from '../../../../../selectors';
 import { getReportUrl } from './blockaid-banner-utils';
 
 const zlib = require('zlib');
@@ -59,8 +57,6 @@ function BlockaidBannerAlert({ txData, ...props }) {
   const { securityAlertResponse, origin, msgParams, type, txParams, chainId } =
     txData;
 
-  const selectorChainId = useSelector(getCurrentChainId);
-
   const t = useContext(I18nContext);
   const { updateTransactionEventFragment } = useTransactionEventFragment();
 
@@ -131,7 +127,7 @@ function BlockaidBannerAlert({ txData, ...props }) {
     const reportData = {
       blockNumber: block,
       blockaidVersion: BlockaidPackage.version,
-      chain: NETWORK_TO_NAME_MAP[chainId ?? selectorChainId],
+      chain: NETWORK_TO_NAME_MAP[chainId],
       classification: isFailedResultType ? 'error' : reason,
       domain: origin ?? msgParams?.origin ?? txParams?.origin,
       jsonRpcMethod: type,
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 9c91ca476ebb..61cbfe13e290 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
@@ -1,16 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
+import { RpcEndpointType } from '@metamask/network-controller';
+import { NetworkType } from '@metamask/controller-utils';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
-import {
-  getNativeCurrency,
-  getProviderConfig,
-} from '../../../../ducks/metamask/metamask';
 import {
   accountsWithSendEtherInfoSelector,
-  getCurrentChainId,
   getCurrentCurrency,
+  selectDefaultRpcEndpointByChainId,
+  selectNetworkConfigurationByChainId,
 } from '../../../../selectors';
 import { formatCurrency } from '../../../../helpers/utils/confirm-tx.util';
 import {
@@ -26,22 +25,33 @@ import NetworkAccountBalanceHeader from '../../../../components/app/network-acco
 const SignatureRequestHeader = ({ txData }) => {
   const t = useI18nContext();
   const {
+    chainId,
     msgParams: { from },
   } = txData;
   const allAccounts = useSelector(accountsWithSendEtherInfoSelector);
   const fromAccount = getAccountByAddress(allAccounts, from);
-  const nativeCurrency = useSelector(getNativeCurrency);
   const currentCurrency = useSelector(getCurrentCurrency);
-  const currentChainId = useSelector(getCurrentChainId);
 
-  const providerConfig = useSelector(getProviderConfig);
-  const networkName = getNetworkNameFromProviderType(providerConfig.type);
+  const { nativeCurrency, name: networkNickname } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
+  const defaultRpcEndpoint = useSelector((state) =>
+    selectDefaultRpcEndpointByChainId(state, chainId),
+  );
+
+  const networkType =
+    defaultRpcEndpoint.type === RpcEndpointType.Custom
+      ? NetworkType.rpc
+      : defaultRpcEndpoint.networkClientId;
+
+  const networkName = getNetworkNameFromProviderType(networkType);
 
   const conversionRate = null; // setting conversion rate to null by default to display balance in native
 
   const currentNetwork =
     networkName === ''
-      ? providerConfig.nickname || t('unknownNetwork')
+      ? networkNickname || t('unknownNetwork')
       : t(networkName);
 
   const balanceInBaseAsset = conversionRate
@@ -71,7 +81,7 @@ const SignatureRequestHeader = ({ txData }) => {
         conversionRate ? currentCurrency?.toUpperCase() : nativeCurrency
       }
       accountAddress={fromAccount.address}
-      chainId={currentChainId}
+      chainId={chainId}
     />
   );
 };
diff --git a/ui/pages/confirmations/components/signature-request-header/signature-request-header.stories.js b/ui/pages/confirmations/components/signature-request-header/signature-request-header.stories.js
index 673b9a67e598..111be8932207 100644
--- a/ui/pages/confirmations/components/signature-request-header/signature-request-header.stories.js
+++ b/ui/pages/confirmations/components/signature-request-header/signature-request-header.stories.js
@@ -1,13 +1,30 @@
 import React from 'react';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { Provider } from 'react-redux';
+import configureStore from '../../../../store/store';
+import testData from '../../../../../.storybook/test-data';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import SignatureRequestHeader from './signature-request-header';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
+const store = configureStore({
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  },
+});
+
 export default {
   title: 'Confirmations/Components/SignatureRequestHeader',
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
   argTypes: {
     txData: { control: 'object' },
   },
   args: {
     txData: {
+      chainId: CHAIN_ID_MOCK,
       msgParams: {
         from: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
         data: JSON.stringify({
diff --git a/ui/pages/confirmations/components/signature-request-header/signature-request-header.test.js b/ui/pages/confirmations/components/signature-request-header/signature-request-header.test.js
index a3ddd3136627..862339239643 100644
--- a/ui/pages/confirmations/components/signature-request-header/signature-request-header.test.js
+++ b/ui/pages/confirmations/components/signature-request-header/signature-request-header.test.js
@@ -1,12 +1,17 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import SignatureRequestHeader from '.';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
+
 const props = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     },
@@ -14,7 +19,10 @@ const props = {
 };
 
 describe('SignatureRequestHeader', () => {
-  const store = configureMockStore()(mockState);
+  const store = configureMockStore()({
+    ...mockState,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  });
 
   it('should match snapshot', () => {
     const { container } = renderWithProvider(
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.stories.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.stories.js
index 297978bb5f04..7343d5c34140 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.stories.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.stories.js
@@ -1,10 +1,16 @@
 import React from 'react';
 import { action } from '@storybook/addon-actions';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { Provider } from 'react-redux';
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
 import testData from '../../../../../.storybook/test-data';
+import configureStore from '../../../../store/store';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import README from './README.mdx';
 import SignatureRequestOriginal from './signature-request-original.component';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
 const [MOCK_PRIMARY_ACCOUNT, MOCK_SECONDARY_ACCOUNT] = Object.values(
   testData.metamask.internalAccounts.accounts,
 );
@@ -41,9 +47,17 @@ const MOCK_SIGN_DATA = JSON.stringify({
   },
 });
 
+const store = configureStore({
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  },
+});
+
 export default {
   title: 'Confirmations/Components/SignatureRequestOriginal',
-
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
   component: SignatureRequestOriginal,
   parameters: {
     docs: {
@@ -87,6 +101,7 @@ DefaultStory.storyName = 'personal_sign Type';
 
 DefaultStory.args = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
       data: MOCK_SIGN_DATA,
@@ -102,6 +117,7 @@ ETHSignTypedStory.storyName = 'eth_signTypedData Type';
 
 ETHSignTypedStory.args = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
       data: [
@@ -128,6 +144,7 @@ AccountMismatchStory.storyName = 'Account Mismatch warning';
 
 AccountMismatchStory.args = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
       data: MOCK_SIGN_DATA,
diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.test.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.test.js
index 11577f44e312..b8d1429751e6 100644
--- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.test.js
+++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.test.js
@@ -3,6 +3,7 @@ import configureMockStore from 'redux-mock-store';
 import { fireEvent, screen } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import { EthAccountType } from '@metamask/keyring-api';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
 import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../../shared/constants/security-provider';
 import mockState from '../../../../../test/data/mock-state.json';
@@ -11,6 +12,7 @@ import configureStore from '../../../../store/store';
 import { rejectPendingApproval } from '../../../../store/actions';
 import { shortenAddress } from '../../../../helpers/utils/util';
 import { ETH_EOA_METHODS } from '../../../../../shared/constants/eth-methods';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import SignatureRequestOriginal from '.';
 
 jest.mock('../../../../store/actions', () => ({
@@ -21,12 +23,15 @@ jest.mock('../../../../store/actions', () => ({
   setLastInteractedConfirmationInfo: jest.fn(),
 }));
 
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
+
 const address = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 
 const props = {
   signMessage: jest.fn(),
   cancelMessage: jest.fn(),
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: address,
       data: [
@@ -76,6 +81,7 @@ const render = ({ txData = props.txData, selectedAccount } = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
+      ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
       internalAccounts,
     },
   });
@@ -120,6 +126,7 @@ describe('SignatureRequestOriginal', () => {
 
   it('should escape RTL character in label or value', () => {
     const txData = {
+      chainId: CHAIN_ID_MOCK,
       msgParams: {
         from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         data: [
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 a524cbcc1caf..fcf0bb30d8a3 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
@@ -169,7 +169,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
         >
           966.987986
            
-          ETH
+          GoerliETH
         </h6>
       </div>
     </div>
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.stories.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.stories.js
index de29680421c6..7900cfe1828d 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.stories.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.stories.js
@@ -1,18 +1,37 @@
 import React from 'react';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { Provider } from 'react-redux';
 import testData from '../../../../../.storybook/test-data';
+import configureStore from '../../../../store/store';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import README from './README.mdx';
 import SignatureRequestSIWE from './signature-request-siwe';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
+const TRANSACTION_DATA_MOCK = {
+  chainId: CHAIN_ID_MOCK,
+};
+
 const {
   internalAccounts: { accounts, selectedAccount },
 } = testData.metamask;
+
 const otherAccount = Object.values(accounts)[1];
 
 const { address: selectedAddress } = accounts[selectedAccount];
 
+const store = configureStore({
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  },
+});
+
 export default {
   title: 'Confirmations/Components/SignatureRequestSIWE',
-
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
   component: SignatureRequestSIWE,
   parameters: {
     docs: {
@@ -134,6 +153,7 @@ DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
   txData: {
+    ...TRANSACTION_DATA_MOCK,
     msgParams,
   },
 };
@@ -144,6 +164,7 @@ export const BadDomainStory = (args) => {
 
 BadDomainStory.args = {
   txData: {
+    ...TRANSACTION_DATA_MOCK,
     msgParams: badDomainParams,
   },
 };
@@ -154,6 +175,7 @@ export const BadAddressStory = (args) => {
 
 BadAddressStory.args = {
   txData: {
+    ...TRANSACTION_DATA_MOCK,
     msgParams: badAddressParams,
   },
 };
@@ -164,6 +186,7 @@ export const BadDomainAndAddressStory = (args) => {
 
 BadDomainAndAddressStory.args = {
   txData: {
+    ...TRANSACTION_DATA_MOCK,
     msgParams: badDomainAndAddressParams,
   },
 };
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 c97be33e45b0..f8f1a67b8cbc 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
@@ -2,14 +2,16 @@ import React from 'react';
 import { cloneDeep } from 'lodash';
 import { fireEvent } from '@testing-library/react';
 import { ApprovalType } from '@metamask/controller-utils';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import configureStore from '../../../../store/store';
-import { getCurrentChainId } from '../../../../selectors';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import SignatureRequestSIWE from '.';
 
 const MOCK_ORIGIN = 'https://example-dapp.website';
 const MOCK_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
 
 const mockStoreInitialState = {
   metamask: {
@@ -20,6 +22,7 @@ const mockStoreInitialState = {
         name: 'Example Test Dapp',
       },
     },
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
   },
 };
 
@@ -37,6 +40,7 @@ const mockProps = {
   cancelPersonalMessage: jest.fn(),
   signPersonalMessage: jest.fn(),
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: MOCK_ADDRESS,
       data: '0x6c6f63616c686f73743a383038302077616e747320796f7520746f207369676e20696e207769746820796f757220457468657265756d206163636f756e743a0a3078466232433135303034333433393034653566343038323537386334653865313131303563463765330a0a436c69636b20746f207369676e20696e20616e642061636365707420746865205465726d73206f6620536572766963653a2068747470733a2f2f636f6d6d756e6974792e6d6574616d61736b2e696f2f746f730a0a5552493a20687474703a2f2f6c6f63616c686f73743a383038300a56657273696f6e3a20310a436861696e2049443a20310a4e6f6e63653a2053544d74364b514d7777644f58453330360a4973737565642041743a20323032322d30332d31385432313a34303a34302e3832335a0a5265736f75726365733a0a2d20697066733a2f2f516d653773733341525667787636725871565069696b4d4a3875324e4c676d67737a673133705972444b456f69750a2d2068747470733a2f2f6578616d706c652e636f6d2f6d792d776562322d636c61696d2e6a736f6e',
@@ -183,7 +187,7 @@ describe('SignatureRequestSIWE (Sign in with Ethereum)', () => {
           transactions: [
             ...mockStoreInitialState.metamask.transactions,
             {
-              chainId: getCurrentChainId(mockStoreInitialState),
+              chainId: CHAIN_ID_MOCK,
               status: 'unapproved',
             },
           ],
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 ba272fc26d89..943f8699b9aa 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
@@ -177,26 +177,6 @@ exports[`Signature Request Component render should match snapshot when we are us
     <div
       class="signature-request-content"
     >
-      <div
-        class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
-      >
-        <span
-          class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
-          style="mask-image: url('./images/icons/info.svg');"
-        />
-        <div
-          class="mm-box mm-box--min-width-0"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            To view and confirm your most recent request, you'll need to approve or reject existing requests first.
-          </p>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          />
-        </div>
-      </div>
       <div
         class="signature-request__origin"
       >
@@ -962,7 +942,6 @@ exports[`Signature Request Component render should match snapshot when we want t
           >
             0
              
-            ETH
           </h6>
         </div>
       </div>
@@ -970,26 +949,6 @@ exports[`Signature Request Component render should match snapshot when we want t
     <div
       class="signature-request-content"
     >
-      <div
-        class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
-      >
-        <span
-          class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
-          style="mask-image: url('./images/icons/info.svg');"
-        />
-        <div
-          class="mm-box mm-box--min-width-0"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            To view and confirm your most recent request, you'll need to approve or reject existing requests first.
-          </p>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          />
-        </div>
-      </div>
       <div
         class="signature-request__origin"
       >
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.js b/ui/pages/confirmations/components/signature-request/signature-request.js
index 3cf2a54327c9..2a7977da0c75 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.js
@@ -18,16 +18,14 @@ import {
   doesAddressRequireLedgerHidConnection,
   getSubjectMetadata,
   getTotalUnapprovedMessagesCount,
+  selectNetworkConfigurationByChainId,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   accountsWithSendEtherInfoSelector,
   getSelectedAccount,
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../../selectors';
-import {
-  getProviderConfig,
-  isAddressLedger,
-} from '../../../../ducks/metamask/metamask';
+import { isAddressLedger } from '../../../../ducks/metamask/metamask';
 import {
   sanitizeMessage,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -97,6 +95,7 @@ const SignatureRequest = ({ txData, warnings }) => {
   const {
     id,
     type,
+    chainId,
     msgParams: { from, data, origin, version },
   } = txData;
 
@@ -104,7 +103,12 @@ const SignatureRequest = ({ txData, warnings }) => {
   const hardwareWalletRequiresConnection = useSelector((state) =>
     doesAddressRequireLedgerHidConnection(state, from),
   );
-  const { chainId, rpcPrefs } = useSelector(getProviderConfig);
+
+  const { blockExplorerUrls } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
+  const blockExplorerUrl = blockExplorerUrls?.[0];
   const unapprovedMessagesCount = useSelector(getTotalUnapprovedMessagesCount);
   const subjectMetadata = useSelector(getSubjectMetadata);
   const isLedgerWallet = useSelector((state) => isAddressLedger(state, from));
@@ -337,7 +341,7 @@ const SignatureRequest = ({ txData, warnings }) => {
           <ContractDetailsModal
             toAddress={verifyingContract}
             chainId={chainId}
-            rpcPrefs={rpcPrefs}
+            blockExplorerUrl={blockExplorerUrl}
             onClose={() => setShowContractDetails(false)}
             isContractRequestingSignature
           />
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.stories.js b/ui/pages/confirmations/components/signature-request/signature-request.stories.js
index b31032f8b1a7..cc5374e2becb 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.stories.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.stories.js
@@ -1,21 +1,25 @@
 import React from 'react';
 import { Provider } from 'react-redux';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import configureStore from '../../../../store/store';
 import testData from '../../../../../.storybook/test-data';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import README from './README.mdx';
 import SignatureRequest from './signature-request';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
 const store = configureStore({
   ...testData,
   metamask: {
     ...testData.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
   },
 });
 
 export default {
   title: 'Confirmations/Components/SignatureRequest',
   decorators: [(story) => <Provider store={store}>{story()}</Provider>],
-
   component: SignatureRequest,
   parameters: {
     docs: {
@@ -35,6 +39,7 @@ DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       from: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
       data: JSON.stringify({
@@ -82,6 +87,7 @@ AccountMismatchStory.storyName = 'AccountMismatch';
 AccountMismatchStory.args = {
   ...DefaultStory.args,
   txData: {
+    chainId: CHAIN_ID_MOCK,
     msgParams: {
       ...DefaultStory.args.txData.msgParams,
       from: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
diff --git a/ui/pages/confirmations/components/signature-request/signature-request.test.js b/ui/pages/confirmations/components/signature-request/signature-request.test.js
index 9851cdbef454..2e10381c40cb 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request.test.js
+++ b/ui/pages/confirmations/components/signature-request/signature-request.test.js
@@ -1,35 +1,25 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import { fireEvent } from '@testing-library/react';
 import configureMockStore from 'redux-mock-store';
 import { EthAccountType } from '@metamask/keyring-api';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../../shared/constants/security-provider';
-import {
-  getNativeCurrency,
-  getProviderConfig,
-} from '../../../../ducks/metamask/metamask';
-import {
-  accountsWithSendEtherInfoSelector,
-  conversionRateSelector,
-  getCurrentCurrency,
-  getMemoizedAddressBook,
-  getPreferences,
-  getSelectedAccount,
-  getTotalUnapprovedMessagesCount,
-  getInternalAccounts,
-  unconfirmedTransactionsHashSelector,
-  getAccountType,
-  getMemoizedMetaMaskInternalAccounts,
-  getSelectedInternalAccount,
-  pendingApprovalsSortedSelector,
-  getNetworkConfigurationsByChainId,
-} from '../../../../selectors';
 import { ETH_EOA_METHODS } from '../../../../../shared/constants/eth-methods';
 import { mockNetworkState } from '../../../../../test/stub/networks';
 import SignatureRequest from './signature-request';
 
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: () => jest.fn(),
+}));
+
+const CHAIN_ID_MOCK = '0x539';
+
+const TRANSACTION_DATA_MOCK = {
+  chainId: CHAIN_ID_MOCK,
+};
+
 const baseProps = {
   clearConfirmTransaction: () => jest.fn(),
   cancel: () => jest.fn(),
@@ -37,8 +27,11 @@ const baseProps = {
   showRejectTransactionsConfirmationModal: () => jest.fn(),
   sign: () => jest.fn(),
 };
+
 const mockStore = {
+  ...mockState,
   metamask: {
+    ...mockState.metamask,
     ...mockNetworkState({
       chainId: '0x539',
       nickname: 'Localhost 8545',
@@ -61,12 +54,13 @@ const mockStore = {
           metadata: {
             name: 'John Doe',
             keyring: {
-              type: 'HD Key Tree',
+              type: 'Custody',
             },
           },
           options: {},
           methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
+          balance: 0,
         },
       },
       selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
@@ -94,15 +88,6 @@ const mockStore = {
     },
   },
 };
-jest.mock('react-redux', () => {
-  const actual = jest.requireActual('react-redux');
-
-  return {
-    ...actual,
-    useSelector: jest.fn(),
-    useDispatch: () => jest.fn(),
-  };
-});
 
 const mockCustodySignFn = jest.fn();
 
@@ -114,62 +99,13 @@ jest.mock('../../../../hooks/useMMICustodySignMessage', () => ({
 
 jest.mock('@metamask-institutional/extension');
 
-const generateUseSelectorRouter = (opts) => (selector) => {
-  const mockSelectedInternalAccount = getSelectedInternalAccount(opts);
-
-  switch (selector) {
-    case getProviderConfig:
-      return getProviderConfig(opts);
-    case getCurrentCurrency:
-      return opts.metamask.currentCurrency;
-    case getNativeCurrency:
-      return getProviderConfig(opts).ticker;
-    case getTotalUnapprovedMessagesCount:
-      return opts.metamask.unapprovedTypedMessagesCount;
-    case getPreferences:
-      return opts.metamask.preferences;
-    case conversionRateSelector:
-      return opts.metamask.currencyRates[getProviderConfig(opts).ticker]
-        ?.conversionRate;
-    case getSelectedAccount:
-      return mockSelectedInternalAccount;
-    case getInternalAccounts:
-      return Object.values(opts.metamask.internalAccounts.accounts);
-    case getMemoizedMetaMaskInternalAccounts:
-      return Object.values(opts.metamask.internalAccounts.accounts);
-    case getMemoizedAddressBook:
-      return [];
-    case accountsWithSendEtherInfoSelector:
-      return Object.values(opts.metamask.internalAccounts.accounts).map(
-        (internalAccount) => {
-          return {
-            ...internalAccount,
-            ...(opts.metamask.accounts[internalAccount.address] ?? {}),
-            balance:
-              opts.metamask.accounts[internalAccount.address]?.balance ?? 0,
-          };
-        },
-      );
-    case getAccountType:
-      return 'custody';
-    case unconfirmedTransactionsHashSelector:
-      return {};
-    case pendingApprovalsSortedSelector:
-      return Object.values(opts.metamask.pendingApprovals);
-    case getNetworkConfigurationsByChainId:
-      return opts.metamask.networkConfigurationsByChainId;
-    default:
-      return undefined;
-  }
-};
 describe('Signature Request Component', () => {
-  const store = configureMockStore()(mockState);
+  const store = configureMockStore()(mockStore);
 
   describe('render', () => {
     let messageData;
 
     beforeEach(() => {
-      useSelector.mockImplementation(generateUseSelectorRouter(mockStore));
       messageData = {
         domain: {
           chainId: 97,
@@ -219,35 +155,39 @@ describe('Signature Request Component', () => {
     });
 
     it('should match snapshot when we want to switch to fiat', () => {
-      useSelector.mockImplementation(
-        generateUseSelectorRouter({
-          ...mockStore,
-          metamask: {
-            ...mockStore.metamask,
-            currencyRates: {
-              ...mockStore.metamask.currencyRates,
-              ETH: {
-                ...(mockStore.metamask.currencyRates.ETH || {}),
-                conversionRate: 231.06,
-              },
+      const storeOverride = configureMockStore()({
+        ...mockStore,
+        metamask: {
+          ...mockStore.metamask,
+          ...mockNetworkState({
+            chainId: CHAIN_ID_MOCK,
+          }),
+          currencyRates: {
+            ...mockStore.metamask.currencyRates,
+            ETH: {
+              ...(mockStore.metamask.currencyRates.ETH || {}),
+              conversionRate: 231.06,
             },
           },
-        }),
-      );
+        },
+      });
+
       const msgParams = {
         from: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
         data: JSON.stringify(messageData),
         version: 'V4',
         origin: 'test',
       };
+
       const { container } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
-        store,
+        storeOverride,
       );
 
       expect(container).toMatchSnapshot();
@@ -260,10 +200,12 @@ describe('Signature Request Component', () => {
         version: 'V4',
         origin: 'test',
       };
+
       const { container } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -280,10 +222,12 @@ describe('Signature Request Component', () => {
         version: 'V4',
         origin: 'test',
       };
+
       const { queryByTestId } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -308,6 +252,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -321,29 +266,30 @@ describe('Signature Request Component', () => {
     });
 
     it('should not render a reject multiple requests link if there is not multiple requests', () => {
-      useSelector.mockImplementation(
-        generateUseSelectorRouter({
-          ...mockStore,
-          metamask: {
-            ...mockStore.metamask,
-            unapprovedTypedMessagesCount: 0,
-          },
-        }),
-      );
+      const storeOverride = configureMockStore()({
+        ...mockStore,
+        metamask: {
+          ...mockStore.metamask,
+          unapprovedTypedMessagesCount: 0,
+        },
+      });
+
       const msgParams = {
         from: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
         data: JSON.stringify(messageData),
         version: 'V4',
         origin: 'test',
       };
+
       const { container } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
-        store,
+        storeOverride,
       );
 
       expect(
@@ -358,10 +304,12 @@ describe('Signature Request Component', () => {
         version: 'V4',
         origin: 'test',
       };
+
       const { container } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -384,6 +332,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -408,6 +357,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -429,6 +379,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
             securityProviderResponse: {
               flagAsDangerous: '?',
@@ -461,6 +412,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
             securityProviderResponse: {
               flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS,
@@ -480,77 +432,76 @@ describe('Signature Request Component', () => {
     });
 
     it('should render a warning when the selected account is not the one being used to sign', () => {
-      const msgParams = {
-        from: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
-        data: JSON.stringify(messageData),
-        version: 'V4',
-        origin: 'test',
-      };
-
-      useSelector.mockImplementation(
-        generateUseSelectorRouter({
-          ...mockStore,
-          metamask: {
-            ...mockStore.metamask,
+      const storeOverride = configureMockStore()({
+        ...mockStore,
+        metamask: {
+          ...mockStore.metamask,
+          accounts: {
+            ...mockStore.metamask.accounts,
+            '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+              address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+              balance: '0x0',
+              name: 'Account 1',
+            },
+            '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5': {
+              address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+              balance: '0x0',
+              name: 'Account 2',
+            },
+          },
+          internalAccounts: {
             accounts: {
-              ...mockStore.metamask.accounts,
-              '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+              'b7e813d6-e31c-4bad-8615-8d4eff9f44f1': {
                 address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-                balance: '0x0',
-                name: 'Account 1',
-              },
-              '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5': {
-                address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
-                balance: '0x0',
-                name: 'Account 2',
-              },
-            },
-            internalAccounts: {
-              accounts: {
-                'b7e813d6-e31c-4bad-8615-8d4eff9f44f1': {
-                  address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-                  id: 'b7e813d6-e31c-4bad-8615-8d4eff9f44f1',
-                  metadata: {
-                    name: 'Account 1',
-                    keyring: {
-                      type: 'HD Key Tree',
-                    },
+                id: 'b7e813d6-e31c-4bad-8615-8d4eff9f44f1',
+                metadata: {
+                  name: 'Account 1',
+                  keyring: {
+                    type: 'HD Key Tree',
                   },
-                  options: {},
-                  methods: ETH_EOA_METHODS,
-                  type: EthAccountType.Eoa,
                 },
-                'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
-                  address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
-                  id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
-                  metadata: {
-                    name: 'Account 2',
-                    keyring: {
-                      type: 'HD Key Tree',
-                    },
+                options: {},
+                methods: ETH_EOA_METHODS,
+                type: EthAccountType.Eoa,
+              },
+              'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
+                address: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+                id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+                metadata: {
+                  name: 'Account 2',
+                  keyring: {
+                    type: 'HD Key Tree',
                   },
-                  options: {},
-                  methods: ETH_EOA_METHODS,
-                  type: EthAccountType.Eoa,
                 },
+                options: {},
+                methods: ETH_EOA_METHODS,
+                type: EthAccountType.Eoa,
               },
-              selectedAccount: 'b7e813d6-e31c-4bad-8615-8d4eff9f44f1',
             },
+            selectedAccount: 'b7e813d6-e31c-4bad-8615-8d4eff9f44f1',
           },
-        }),
-      );
+        },
+      });
+
+      const msgParams = {
+        from: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
+        data: JSON.stringify(messageData),
+        version: 'V4',
+        origin: 'test',
+      };
 
       const { container } = renderWithProvider(
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
             securityProviderResponse: {
               flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS,
             },
           }}
         />,
-        store,
+        storeOverride,
       );
 
       expect(
@@ -571,6 +522,7 @@ describe('Signature Request Component', () => {
           {...baseProps}
           conversionRate={null}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
             securityAlertResponse: {
               resultType: 'Malicious',
@@ -602,6 +554,7 @@ describe('Signature Request Component', () => {
         <SignatureRequest
           {...baseProps}
           txData={{
+            ...TRANSACTION_DATA_MOCK,
             msgParams,
           }}
         />,
@@ -610,7 +563,9 @@ describe('Signature Request Component', () => {
 
       const rejectRequestsLink = getByTestId('page-container-footer-next');
       fireEvent.click(rejectRequestsLink);
-      expect(mockCustodySignFn).toHaveBeenCalledWith({ msgParams });
+      expect(mockCustodySignFn).toHaveBeenCalledWith(
+        expect.objectContaining({ msgParams }),
+      );
     });
   });
 });
diff --git a/ui/pages/confirmations/confirm-signature-request/index.test.js b/ui/pages/confirmations/confirm-signature-request/index.test.js
index e0c7c7c8bbeb..f634bf40845c 100644
--- a/ui/pages/confirmations/confirm-signature-request/index.test.js
+++ b/ui/pages/confirmations/confirm-signature-request/index.test.js
@@ -7,13 +7,21 @@ import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { mockNetworkState } from '../../../../test/stub/networks';
 import ConfTx from '.';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
+
 const mockState = {
   metamask: {
+    ...mockNetworkState({
+      chainId: CHAIN_IDS.GOERLI,
+      nickname: 'Goerli test network',
+      ticker: undefined,
+    }),
     unapprovedPersonalMsgs: {},
     unapprovedPersonalMsgCount: 0,
     unapprovedTypedMessages: {
       267460284130106: {
         id: 267460284130106,
+        chainId: CHAIN_ID_MOCK,
         msgParams: {
           data: '{"domain":{"chainId":"5","name":"Ether Mail","verifyingContract":"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC","version":"1"},"message":{"contents":"Hello, Bob!","from":{"name":"Cow","wallets":["0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826","0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]},"to":[{"name":"Bob","wallets":["0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB","0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57","0xB0B0b0b0b0b0B000000000000000000000000000"]}]},"primaryType":"Mail","types":{"EIP712Domain":[{"name":"name","type":"string"},{"name":"version","type":"string"},{"name":"chainId","type":"uint256"},{"name":"verifyingContract","type":"address"}],"Group":[{"name":"name","type":"string"},{"name":"members","type":"Person[]"}],"Mail":[{"name":"from","type":"Person"},{"name":"to","type":"Person[]"},{"name":"contents","type":"string"}],"Person":[{"name":"name","type":"string"},{"name":"wallets","type":"address[]"}]}}',
           from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
@@ -27,11 +35,6 @@ const mockState = {
       },
     },
     unapprovedTypedMessagesCount: 1,
-    ...mockNetworkState({
-      chainId: CHAIN_IDS.GOERLI,
-      nickname: 'Goerli test network',
-      ticker: undefined,
-    }),
     currencyRates: {},
     keyrings: [],
     subjectMetadata: {},
diff --git a/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts b/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
index 1b6412d66614..2f26fcefbee9 100644
--- a/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
+++ b/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
@@ -15,7 +15,6 @@ import {
 import { Alert } from '../../../../ducks/confirm-alerts/confirm-alerts';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { getCurrentChainId } from '../../../../selectors';
 import {
   SIGNATURE_TRANSACTION_TYPES,
   REDESIGN_DEV_TRANSACTION_TYPES,
@@ -51,7 +50,6 @@ type SecurityAlertResponsesState = {
 const useBlockaidAlerts = (): Alert[] => {
   const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext();
-  const selectorChainId = useSelector(getCurrentChainId);
 
   const securityAlertId = (
     currentConfirmation?.securityAlertResponse as SecurityAlertResponse
@@ -99,9 +97,7 @@ const useBlockaidAlerts = (): Alert[] => {
     const reportData = {
       blockNumber: block,
       blockaidVersion: BlockaidPackage.version,
-      chain: (NETWORK_TO_NAME_MAP as Record<string, string>)[
-        chainId ?? selectorChainId
-      ],
+      chain: (NETWORK_TO_NAME_MAP as Record<string, string>)[chainId],
       classification: isFailedResultType ? 'error' : reason,
       domain: origin ?? msgParams?.origin ?? origin,
       jsonRpcMethod: type,
diff --git a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
index 4c6dddfa7a5a..f0463287ef34 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNetworkInfo.ts
@@ -6,30 +6,23 @@ import {
   NETWORK_TO_NAME_MAP,
 } from '../../../../shared/constants/network';
 
-import {
-  getCurrentChainId,
-  getNetworkConfigurationsByChainId,
-} from '../../../selectors';
-
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useConfirmContext } from '../context/confirm';
+import { selectNetworkConfigurationByChainId } from '../../../selectors';
 
 function useConfirmationNetworkInfo() {
   const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext();
-  const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
-  const currentChainId = useSelector(getCurrentChainId);
+  const chainId = currentConfirmation?.chainId as Hex;
+
+  const networkConfiguration = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
 
   let networkDisplayName = '';
   let networkImageUrl = '';
 
   if (currentConfirmation) {
-    // use the current confirmation chainId, else use the current network chainId
-    const chainId =
-      (currentConfirmation?.chainId as Hex | undefined) ?? currentChainId;
-
-    const networkConfiguration = networkConfigurations[chainId];
-
     networkDisplayName =
       networkConfiguration?.name ??
       NETWORK_TO_NAME_MAP[chainId as keyof typeof NETWORK_TO_NAME_MAP] ??
diff --git a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.test.ts b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.test.ts
index dff0103fbe21..9c98432918e2 100644
--- a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.test.ts
+++ b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.test.ts
@@ -1,6 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { useContext } from 'react';
 
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { TokenStandard } from '../../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { TokenDetailsERC20 } from '../utils/token';
@@ -30,7 +31,7 @@ describe('useTrackERC20WithoutDecimalInformation', () => {
     });
 
     renderHook(() =>
-      useTrackERC20WithoutDecimalInformation('0x5', {
+      useTrackERC20WithoutDecimalInformation(CHAIN_IDS.MAINNET, '0x5', {
         standard: TokenStandard.ERC20,
       } as TokenDetailsERC20),
     );
diff --git a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
index fa6a5e620fc4..266048e11134 100644
--- a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
+++ b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
@@ -1,4 +1,3 @@
-import { useSelector } from 'react-redux';
 import { useContext, useEffect } from 'react';
 import { Hex } from '@metamask/utils';
 
@@ -10,23 +9,23 @@ import {
 } from '../../../../shared/constants/metametrics';
 import { TokenStandard } from '../../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { getCurrentChainId } from '../../../selectors';
 import { parseTokenDetailDecimals, TokenDetailsERC20 } from '../utils/token';
 
 /**
  * Track event that number of decimals in ERC20 is not obtained
  *
+ * @param chainId
  * @param tokenAddress
  * @param tokenDetails
  * @param metricLocation
  */
 const useTrackERC20WithoutDecimalInformation = (
+  chainId: Hex,
   tokenAddress: Hex | string | undefined,
   tokenDetails?: TokenDetailsERC20,
   metricLocation = MetaMetricsEventLocation.SignatureConfirmation,
 ) => {
   const trackEvent = useContext(MetaMetricsContext);
-  const chainId = useSelector(getCurrentChainId);
 
   useEffect(() => {
     if (chainId === undefined || tokenDetails === undefined) {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index bb7ef5f796d7..4ea9f20371ab 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -700,6 +700,28 @@ export const getNetworkConfigurationsByChainId = createDeepEqualSelector(
   (networkConfigurationsByChainId) => networkConfigurationsByChainId,
 );
 
+/**
+ * @type (state: any, chainId: string) => import('@metamask/network-controller').NetworkConfiguration
+ */
+export const selectNetworkConfigurationByChainId = createSelector(
+  getNetworkConfigurationsByChainId,
+  (_state, chainId) => chainId,
+  (networkConfigurationsByChainId, chainId) =>
+    networkConfigurationsByChainId[chainId],
+);
+
+export const selectDefaultRpcEndpointByChainId = createSelector(
+  selectNetworkConfigurationByChainId,
+  (networkConfiguration) => {
+    if (!networkConfiguration) {
+      return undefined;
+    }
+
+    const { defaultRpcEndpointIndex, rpcEndpoints } = networkConfiguration;
+    return rpcEndpoints[defaultRpcEndpointIndex];
+  },
+);
+
 export function getRequestingNetworkInfo(state, chainIds) {
   // If chainIds is undefined, set it to an empty array
   let processedChainIds = chainIds === undefined ? [] : chainIds;

From cdfaa42e0d4948a6c195d3e24d0caa9342cb35af Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:17:07 +0100
Subject: [PATCH 011/111] test: [POM] Migrate edit network rpc e2e tests and
 create related page class functions (#28161)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate `test/e2e/tests/network/multi-rpc.spec.ts` e2e tests to Page
Object Model (POM) pattern.
- Created edit network related page classes and functions
- Removed unnecessary delay by correctly implementing page object
functions
- Objective of this PR is to improve test stability and maintainability,
it also reduced flakiness.
- update: it also fixes the flaky test Update Network

[![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/28163

## **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>
---
 .../page-objects/pages/dialog/edit-network.ts |  54 ++++
 .../pages/dialog/select-network.ts            |  92 ++++--
 test/e2e/page-objects/pages/homepage.ts       |  86 ++++--
 .../onboarding-privacy-settings-page.ts       |  30 +-
 test/e2e/tests/network/multi-rpc.spec.ts      | 283 ++++++------------
 5 files changed, 304 insertions(+), 241 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/dialog/edit-network.ts

diff --git a/test/e2e/page-objects/pages/dialog/edit-network.ts b/test/e2e/page-objects/pages/dialog/edit-network.ts
new file mode 100644
index 000000000000..09a1dd70a5f9
--- /dev/null
+++ b/test/e2e/page-objects/pages/dialog/edit-network.ts
@@ -0,0 +1,54 @@
+import { Driver } from '../../../webdriver/driver';
+
+class EditNetworkModal {
+  private driver: Driver;
+
+  private readonly editModalNetworkNameInput =
+    '[data-testid="network-form-network-name"]';
+
+  private readonly editModalRpcDropDownButton =
+    '[data-testid="test-add-rpc-drop-down"]';
+
+  private readonly editModalSaveButton = {
+    text: 'Save',
+    tag: 'button',
+  };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.editModalNetworkNameInput,
+        this.editModalRpcDropDownButton,
+        this.editModalSaveButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for select network dialog to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Edit network dialog is loaded');
+  }
+
+  /**
+   * Selects an RPC from the dropdown in the edit network modal.
+   *
+   * @param rpcName - The name of the RPC to select.
+   */
+  async selectRPCInEditNetworkModal(rpcName: string): Promise<void> {
+    console.log(`Select RPC ${rpcName} in edit network modal`);
+    await this.driver.clickElement(this.editModalRpcDropDownButton);
+    await this.driver.clickElement({
+      text: rpcName,
+      tag: 'button',
+    });
+    await this.driver.clickElementAndWaitToDisappear(this.editModalSaveButton);
+  }
+}
+
+export default EditNetworkModal;
diff --git a/test/e2e/page-objects/pages/dialog/select-network.ts b/test/e2e/page-objects/pages/dialog/select-network.ts
index 2c399a4118d8..bc20c42855ae 100644
--- a/test/e2e/page-objects/pages/dialog/select-network.ts
+++ b/test/e2e/page-objects/pages/dialog/select-network.ts
@@ -3,15 +3,15 @@ import { Driver } from '../../../webdriver/driver';
 class SelectNetwork {
   private driver: Driver;
 
-  private networkName: string | undefined;
-
-  private readonly addNetworkButton = {
-    tag: 'button',
-    text: 'Add a custom network',
-  };
+  private readonly addNetworkButton = '[data-testid="test-add-button"]';
 
   private readonly closeButton = 'button[aria-label="Close"]';
 
+  private readonly editNetworkButton =
+    '[data-testid="network-list-item-options-edit"]';
+
+  private readonly rpcUrlItem = '.select-rpc-url__item';
+
   private readonly searchInput =
     '[data-testid="network-redesign-modal-search-input"]';
 
@@ -20,6 +20,11 @@ class SelectNetwork {
     tag: 'h4',
   };
 
+  private readonly selectRpcMessage = {
+    text: 'Select RPC URL',
+    tag: 'h4',
+  };
+
   private readonly toggleButton = '.toggle-button > div';
 
   constructor(driver: Driver) {
@@ -42,15 +47,9 @@ class SelectNetwork {
     console.log('Select network dialog is loaded');
   }
 
-  async selectNetworkName(networkName: string): Promise<void> {
-    console.log(`Click ${networkName}`);
-    this.networkName = `[data-testid="${networkName}"]`;
-    await this.driver.clickElementAndWaitToDisappear(this.networkName);
-  }
-
-  async addNewNetwork(): Promise<void> {
-    console.log('Click Add network');
-    await this.driver.clickElement(this.addNetworkButton);
+  async clickAddButton(): Promise<void> {
+    console.log('Click Add Button');
+    await this.driver.clickElementAndWaitToDisappear(this.addNetworkButton);
   }
 
   async clickCloseButton(): Promise<void> {
@@ -58,21 +57,68 @@ class SelectNetwork {
     await this.driver.clickElementAndWaitToDisappear(this.closeButton);
   }
 
-  async toggleShowTestNetwork(): Promise<void> {
-    console.log('Toggle show test network in select network dialog');
-    await this.driver.clickElement(this.toggleButton);
-  }
-
   async fillNetworkSearchInput(networkName: string): Promise<void> {
     console.log(`Fill network search input with ${networkName}`);
     await this.driver.fill(this.searchInput, networkName);
   }
 
-  async clickAddButton(): Promise<void> {
-    console.log('Click Add Button');
+  async openEditNetworkModal(): Promise<void> {
+    console.log('Open edit network modal');
+    await this.driver.clickElementAndWaitToDisappear(this.editNetworkButton);
+  }
+
+  async openNetworkListOptions(chainId: string): Promise<void> {
+    console.log(`Open network options for ${chainId} in network dialog`);
+    await this.driver.clickElement(
+      `[data-testid="network-list-item-options-button-${chainId}"]`,
+    );
+  }
+
+  async openNetworkRPC(chainId: string): Promise<void> {
+    console.log(`Open network RPC ${chainId}`);
     await this.driver.clickElementAndWaitToDisappear(
-      '[data-testid="test-add-button"]',
+      `[data-testid="network-rpc-name-button-${chainId}"]`,
+    );
+    await this.driver.waitForSelector(this.selectRpcMessage);
+  }
+
+  async selectNetworkName(networkName: string): Promise<void> {
+    console.log(`Click ${networkName}`);
+    const networkNameItem = `[data-testid="${networkName}"]`;
+    await this.driver.clickElementAndWaitToDisappear(networkNameItem);
+  }
+
+  async selectRPC(rpcName: string): Promise<void> {
+    console.log(`Select RPC ${rpcName} for network`);
+    await this.driver.waitForSelector(this.selectRpcMessage);
+    await this.driver.clickElementAndWaitToDisappear({
+      text: rpcName,
+      tag: 'button',
+    });
+  }
+
+  async toggleShowTestNetwork(): Promise<void> {
+    console.log('Toggle show test network in select network dialog');
+    await this.driver.clickElement(this.toggleButton);
+  }
+
+  async check_networkRPCNumber(expectedNumber: number): Promise<void> {
+    console.log(
+      `Wait for ${expectedNumber} RPC URLs to be displayed in select network dialog`,
     );
+    await this.driver.wait(async () => {
+      const rpcNumber = await this.driver.findElements(this.rpcUrlItem);
+      return rpcNumber.length === expectedNumber;
+    }, 10000);
+    console.log(`${expectedNumber} RPC URLs found in select network dialog`);
+  }
+
+  async check_rpcIsSelected(rpcName: string): Promise<void> {
+    console.log(`Check RPC ${rpcName} is selected in network dialog`);
+    await this.driver.waitForSelector({
+      text: rpcName,
+      tag: 'button',
+    });
   }
 }
 
diff --git a/test/e2e/page-objects/pages/homepage.ts b/test/e2e/page-objects/pages/homepage.ts
index 7c322b0f2cbb..101e6f9de83c 100644
--- a/test/e2e/page-objects/pages/homepage.ts
+++ b/test/e2e/page-objects/pages/homepage.ts
@@ -22,6 +22,11 @@ class HomePage {
     css: '.mm-banner-alert',
   };
 
+  private readonly closeUseNetworkNotificationModalButton = {
+    text: 'Got it',
+    tag: 'h6',
+  };
+
   private readonly completedTransactions = '[data-testid="activity-list-item"]';
 
   private readonly confirmedTransactions = {
@@ -34,6 +39,8 @@ class HomePage {
     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"]';
@@ -60,8 +67,16 @@ class HomePage {
     console.log('Home page is loaded');
   }
 
-  async startSendFlow(): Promise<void> {
-    await this.driver.clickElement(this.sendButton);
+  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> {
@@ -69,13 +84,6 @@ class HomePage {
     await this.driver.clickElement(this.activityTab);
   }
 
-  async check_basicFunctionalityOffWarnigMessageIsDisplayed(): Promise<void> {
-    console.log(
-      'Check if basic functionality off warning message is displayed on homepage',
-    );
-    await this.driver.waitForSelector(this.basicFunctionalityOffWarningMessage);
-  }
-
   async goToNFTList(): Promise<void> {
     console.log(`Open NFT tab on homepage`);
     await this.driver.clickElement(this.nftTab);
@@ -85,6 +93,10 @@ class HomePage {
     await this.driver.clickElement(this.nftIconOnActivityList);
   }
 
+  async startSendFlow(): Promise<void> {
+    await this.driver.clickElement(this.sendButton);
+  }
+
   /**
    * Checks if the toaster message for adding a network is displayed on the homepage.
    *
@@ -100,6 +112,37 @@ class HomePage {
     });
   }
 
+  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.
@@ -125,27 +168,20 @@ class HomePage {
   }
 
   /**
-   * 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.
+   * Checks if the toaster message for editing a network is displayed on the homepage.
    *
-   * @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.
+   * @param networkName - The name of the network that was edited.
    */
-  async check_completedTxNumberDisplayedInActivity(
-    expectedNumber: number = 1,
+  async check_editNetworkMessageIsDisplayed(
+    networkName: string,
   ): 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`,
+      `Check the toaster message for editing network ${networkName} is displayed on homepage`,
     );
+    await this.driver.waitForSelector({
+      tag: 'h6',
+      text: `“${networkName}” was successfully edited!`,
+    });
   }
 
   /**
diff --git a/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts b/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
index dac2ab447710..e8288edb98cb 100644
--- a/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
+++ b/test/e2e/page-objects/pages/onboarding/onboarding-privacy-settings-page.ts
@@ -134,8 +134,7 @@ class OnboardingPrivacySettingsPage {
       this.confirmAddCustomNetworkButton,
     );
     // Navigate back to default privacy settings
-    await this.driver.clickElement(this.categoryBackButton);
-    await this.driver.waitForElementToStopMoving(this.categoryBackButton);
+    await this.navigateBackToSettingsPage();
   }
 
   /**
@@ -152,6 +151,16 @@ class OnboardingPrivacySettingsPage {
     );
   }
 
+  /**
+   * Navigate back to the onboarding privacy settings page.
+   */
+  async navigateBackToSettingsPage(): Promise<void> {
+    console.log('Navigate back to onboarding privacy settings page');
+    // Wait until the onboarding carousel has stopped moving otherwise the click has no effect.
+    await this.driver.clickElement(this.categoryBackButton);
+    await this.driver.waitForElementToStopMoving(this.categoryBackButton);
+  }
+
   async navigateToGeneralSettings(): Promise<void> {
     console.log('Navigate to general settings');
     await this.check_pageIsLoaded();
@@ -159,6 +168,17 @@ class OnboardingPrivacySettingsPage {
     await this.driver.waitForSelector(this.generalSettingsMessage);
   }
 
+  /**
+   * Open the edit network modal for a given network name.
+   *
+   * @param networkName - The name of the network to open the edit modal for.
+   */
+  async openEditNetworkModal(networkName: string): Promise<void> {
+    console.log(`Open edit network modal for ${networkName}`);
+    await this.driver.clickElement({ text: networkName, tag: 'p' });
+    await this.driver.waitForSelector(this.addRpcUrlDropDown);
+  }
+
   /**
    * Go to assets settings and toggle options, then navigate back.
    */
@@ -172,8 +192,7 @@ class OnboardingPrivacySettingsPage {
         await this.driver.findClickableElements(this.assetsPrivacyToggle)
       ).map((toggle) => toggle.click()),
     );
-    await this.driver.clickElement(this.categoryBackButton);
-    await this.driver.waitForElementToStopMoving(this.categoryBackButton);
+    await this.navigateBackToSettingsPage();
   }
 
   /**
@@ -186,8 +205,7 @@ class OnboardingPrivacySettingsPage {
     await this.driver.waitForSelector(this.basicFunctionalityTurnOffMessage);
     await this.driver.clickElement(this.basicFunctionalityCheckbox);
     await this.driver.clickElement(this.basicFunctionalityTurnOffButton);
-    await this.driver.clickElement(this.categoryBackButton);
-    await this.driver.waitForElementToStopMoving(this.categoryBackButton);
+    await this.navigateBackToSettingsPage();
   }
 }
 
diff --git a/test/e2e/tests/network/multi-rpc.spec.ts b/test/e2e/tests/network/multi-rpc.spec.ts
index 6fc7025f5dbc..362a4c3e29e4 100644
--- a/test/e2e/tests/network/multi-rpc.spec.ts
+++ b/test/e2e/tests/network/multi-rpc.spec.ts
@@ -1,20 +1,27 @@
 import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
 import FixtureBuilder from '../../fixture-builder';
-import {
-  defaultGanacheOptions,
-  importSRPOnboardingFlow,
-  regularDelayMs,
-  TEST_SEED_PHRASE,
-  unlockWallet,
-  withFixtures,
-} from '../../helpers';
+import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
 import { Mockttp } from '../../mock-e2e';
 import {
   expectMockRequest,
   expectNoMockRequest,
 } 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 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';
+import {
+  loginWithoutBalanceValidation,
+  loginWithBalanceValidation,
+} from '../../page-objects/flows/login.flow';
+import {
+  completeImportSRPOnboardingFlow,
+  importSRPOnboardingFlow,
+} from '../../page-objects/flows/onboarding.flow';
 
 describe('MultiRpc:', function (this: Suite) {
   it('should migrate to multi rpc @no-mmi', async function () {
@@ -73,36 +80,18 @@ describe('MultiRpc:', function (this: Suite) {
       },
 
       async ({ driver }: { driver: Driver }) => {
-        const password = 'password';
-
-        await driver.navigate();
-
-        await importSRPOnboardingFlow(driver, TEST_SEED_PHRASE, password);
+        await completeImportSRPOnboardingFlow(driver);
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
 
-        await driver.delay(regularDelayMs);
-
-        // 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"]');
-
-        // pin extension walkthrough screen
-        await driver.findElement('[data-testid="account-menu-icon"]');
-
-        // Avoid a stale element error
-        await driver.delay(regularDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
-
-        await driver.clickElement(
-          '[data-testid="network-rpc-name-button-0xa4b1"]',
-        );
-
-        const menuItems = await driver.findElements('.select-rpc-url__item');
+        await new HeaderNavbar(driver).clickSwitchNetworkDropDown();
+        const selectNetworkDialog = new SelectNetwork(driver);
+        await selectNetworkDialog.check_pageIsLoaded();
 
         // check rpc number
-        assert.equal(menuItems.length, 2);
+        await selectNetworkDialog.openNetworkRPC('0xa4b1');
+        await selectNetworkDialog.check_networkRPCNumber(2);
       },
     );
   });
@@ -173,7 +162,9 @@ describe('MultiRpc:', function (this: Suite) {
       },
 
       async ({ driver, mockedEndpoint }) => {
-        await unlockWallet(driver);
+        await loginWithoutBalanceValidation(driver);
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
 
         const usedUrlBeforeSwitch = await mockedEndpoint[1].getSeenRequests();
 
@@ -189,28 +180,21 @@ describe('MultiRpc:', function (this: Suite) {
         // check that requests are sent on the background for the rpc https://responsive-rpc.test/
         await expectNoMockRequest(driver, mockedEndpoint[0], { timeout: 3000 });
 
-        // Avoid a stale element error
-        await driver.delay(regularDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
-
-        // select second rpc
-        await driver.clickElement(
-          '[data-testid="network-rpc-name-button-0xa4b1"]',
-        );
-
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.clickSwitchNetworkDropDown();
+        const selectNetworkDialog = new SelectNetwork(driver);
+        await selectNetworkDialog.check_pageIsLoaded();
+        await selectNetworkDialog.openNetworkRPC('0xa4b1');
+        await selectNetworkDialog.check_networkRPCNumber(2);
 
-        await driver.delay(regularDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
+        // select second rpc for Arbitrum network in the network dialog
+        await selectNetworkDialog.selectRPC('Arbitrum mainnet 2');
+        await homePage.check_pageIsLoaded();
+        await headerNavbar.clickSwitchNetworkDropDown();
 
-        const arbitrumRpcUsed = await driver.findElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
+        // check that the second rpc is selected in the network dialog
+        await selectNetworkDialog.check_pageIsLoaded();
+        await selectNetworkDialog.check_rpcIsSelected('Arbitrum mainnet 2');
 
         const usedUrl = await mockedEndpoint[0].getSeenRequests();
         // check the url first request send on the background to the mocked rpc after switch
@@ -218,9 +202,6 @@ describe('MultiRpc:', function (this: Suite) {
 
         // check that requests are sent on the background for the url https://responsive-rpc.test/
         await expectMockRequest(driver, mockedEndpoint[0], { timeout: 3000 });
-
-        const existRpcUsed = arbitrumRpcUsed !== undefined;
-        assert.equal(existRpcUsed, true, 'Second Rpc is used');
       },
     );
   });
@@ -280,53 +261,33 @@ describe('MultiRpc:', function (this: Suite) {
         testSpecificMock: mockRPCURLAndChainId,
       },
 
-      async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-
-        // Avoid a stale element error
-        await driver.delay(regularDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
-
-        // Go to Edit Menu
-        await driver.clickElement(
-          '[data-testid="network-list-item-options-button-0xa4b1"]',
-        );
-        await driver.clickElement(
-          '[data-testid="network-list-item-options-edit"]',
+      async ({ driver, ganacheServer }) => {
+        await loginWithBalanceValidation(driver, ganacheServer);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.clickSwitchNetworkDropDown();
+        const selectNetworkDialog = new SelectNetwork(driver);
+        await selectNetworkDialog.check_pageIsLoaded();
+
+        // go to Edit Menu for Arbitrum network and select the second rpc
+        await selectNetworkDialog.openNetworkListOptions('0xa4b1');
+        await selectNetworkDialog.openEditNetworkModal();
+
+        const editNetworkModal = new EditNetworkModal(driver);
+        await editNetworkModal.check_pageIsLoaded();
+        await editNetworkModal.selectRPCInEditNetworkModal(
+          'Arbitrum mainnet 2',
         );
-        await driver.clickElement('[data-testid="test-add-rpc-drop-down"]');
 
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
+        // validate the network was successfully edited
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_editNetworkMessageIsDisplayed('Arbitrum One');
+        await homePage.closeUseNetworkNotificationModal();
 
-        await driver.clickElement({
-          text: 'Save',
-          tag: 'button',
-        });
-
-        // Validate the network was edited
-        const networkEdited = await driver.isElementPresent({
-          text: '“Arbitrum One” was successfully edited!',
-        });
-        assert.equal(
-          networkEdited,
-          true,
-          '“Arbitrum One” was successfully edited!',
-        );
-
-        await driver.delay(regularDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
-
-        const arbitrumRpcUsed = await driver.findElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
-
-        const existRpcUsed = arbitrumRpcUsed !== undefined;
-        assert.equal(existRpcUsed, true, 'Second Rpc is used');
+        // check that the second rpc is selected in the network dialog
+        await headerNavbar.clickSwitchNetworkDropDown();
+        await selectNetworkDialog.check_pageIsLoaded();
+        await selectNetworkDialog.check_rpcIsSelected('Arbitrum mainnet 2');
       },
     );
   });
@@ -387,93 +348,41 @@ describe('MultiRpc:', function (this: Suite) {
       },
 
       async ({ driver }: { driver: Driver }) => {
-        const password = 'password';
-
-        await driver.navigate();
-
-        await importSRPOnboardingFlow(driver, TEST_SEED_PHRASE, password);
-
-        await driver.delay(regularDelayMs);
-
-        // go to advanced settigns
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Manage default privacy settings',
-        });
-
-        await driver.clickElement({
-          text: 'General',
-        });
-
-        // open edit modal
-        await driver.clickElement({
-          text: 'arbitrum-mainnet.infura.io',
-          tag: 'p',
-        });
-
-        await driver.clickElement('[data-testid="test-add-rpc-drop-down"]');
-
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
-
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Save',
-          tag: 'button',
-        });
-
-        await driver.clickElement('[data-testid="category-back-button"]');
-
-        await driver.clickElement(
-          '[data-testid="privacy-settings-back-button"]',
+        await importSRPOnboardingFlow(driver);
+        const onboardingCompletePage = new OnboardingCompletePage(driver);
+        await onboardingCompletePage.check_pageIsLoaded();
+        await onboardingCompletePage.navigateToDefaultPrivacySettings();
+        const onboardingPrivacySettingsPage = new OnboardingPrivacySettingsPage(
+          driver,
         );
+        await onboardingPrivacySettingsPage.check_pageIsLoaded();
+        await onboardingPrivacySettingsPage.navigateToGeneralSettings();
 
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Done',
-          tag: 'button',
-        });
-
-        await driver.clickElement({
-          text: 'Next',
-          tag: 'button',
-        });
-
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Done',
-          tag: 'button',
-        });
-
-        // Validate the network was edited
-        const networkEdited = await driver.isElementPresent({
-          text: '“Arbitrum One” was successfully edited!',
-        });
-        assert.equal(
-          networkEdited,
-          true,
-          '“Arbitrum One” was successfully edited!',
+        // open edit network modal during onboarding and select the second rpc
+        await onboardingPrivacySettingsPage.openEditNetworkModal(
+          'Arbitrum One',
         );
-        // Ensures popover backround doesn't kill test
-        await driver.assertElementNotPresent('.popover-bg');
-
-        // We need to use clickElementSafe + assertElementNotPresent as sometimes the network dialog doesn't appear, as per this issue (#27870)
-        // TODO: change the 2 actions for clickElementAndWaitToDisappear, once the issue is fixed
-        await driver.clickElementSafe({ tag: 'h6', text: 'Got it' });
-
-        await driver.assertElementNotPresent({
-          tag: 'h6',
-          text: 'Got it',
-        });
-
-        await driver.clickElement('[data-testid="network-display"]');
-
-        const arbitrumRpcUsed = await driver.findElement({
-          text: 'Arbitrum mainnet 2',
-          tag: 'button',
-        });
-
-        const existRpcUsed = arbitrumRpcUsed !== undefined;
-        assert.equal(existRpcUsed, true, 'Second Rpc is used');
+        const editNetworkModal = new EditNetworkModal(driver);
+        await editNetworkModal.check_pageIsLoaded();
+        await editNetworkModal.selectRPCInEditNetworkModal(
+          'Arbitrum mainnet 2',
+        );
+        await onboardingPrivacySettingsPage.navigateBackToSettingsPage();
+        await onboardingPrivacySettingsPage.check_pageIsLoaded();
+        await onboardingPrivacySettingsPage.navigateBackToOnboardingCompletePage();
+
+        // finish onboarding and check the network successfully edited message is displayed
+        await onboardingCompletePage.completeOnboarding();
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_editNetworkMessageIsDisplayed('Arbitrum One');
+        await homePage.closeUseNetworkNotificationModal();
+
+        // check that the second rpc is selected in the network dialog
+        await new HeaderNavbar(driver).clickSwitchNetworkDropDown();
+        const selectNetworkDialog = new SelectNetwork(driver);
+        await selectNetworkDialog.check_pageIsLoaded();
+        await selectNetworkDialog.check_rpcIsSelected('Arbitrum mainnet 2');
       },
     );
   });

From 49e5e7861bb70571942e70c3f0c0ca29918d3e97 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Mon, 4 Nov 2024 10:39:12 +0000
Subject: [PATCH 012/111] fix: Prevent coercing symbols to zero in the edit
 spending cap modal (#28192)
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**

Since the `TextField` in the "edit spending cap" modal has a type
`TextFieldType.Number`, it already blocks most symbols and letters.
However, it does currently support `+`, `-` and `e` characters as they
can be used to construe numbers.

For example, when a `-` sign is introduced in the input field, the
interim value is coerced to `''`, as there is no numerical equivalent to
the sign by itself. The first part of this fix was to disable the "Save"
button on such cases. If the user wants to revoke the spending cap, they
can introduce `0`, but `''` is not a valid response.

Furthermore, when a valid number is introduced but that uses scientific
notation or `+`/`-` signs, the submission is disabled and a validation
message is shown to the user: "Enter numbers only".

<!--
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/28192?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Deploy an erc20 token contract in the test DApp
2. Trigger an approve confirmation
3. Attempt to edit the spending cap with -1, 10e10, or any others.
4. You should be prevented from submitting and see the validation
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] -->
<img width="360" alt="Screenshot 2024-10-30 at 17 46 48"
src="https://github.com/user-attachments/assets/1e05da98-e362-45ee-8fd0-a988e853677b">


## **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/en/messages.json                    |  3 +++
 .../edit-spending-cap-modal.tsx                  | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index cc077810750b..4b3c59b52297 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1824,6 +1824,9 @@
   "editSpendingCapError": {
     "message": "The spending cap can’t exceed $1 decimal digits. Remove decimal digits to continue."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Enter numbers only"
+  },
   "enable": {
     "message": "Enable"
   },
diff --git a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
index 2762e99652a5..f908333e4f25 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
@@ -124,6 +124,8 @@ export const EditSpendingCapModal = ({
     decimals &&
     parseInt(decimals, 10) < countDecimalDigits(customSpendingCapInputValue);
 
+  const showSpecialCharacterError = /[-+e]/u.test(customSpendingCapInputValue);
+
   return (
     <Modal
       isOpen={isOpenEditSpendingCapModal}
@@ -171,6 +173,15 @@ export const EditSpendingCapModal = ({
               {t('editSpendingCapError', [decimals])}
             </Text>
           )}
+          {showSpecialCharacterError && (
+            <Text
+              variant={TextVariant.bodySm}
+              color={TextColor.errorDefault}
+              paddingTop={1}
+            >
+              {t('editSpendingCapSpecialCharError')}
+            </Text>
+          )}
           <Text
             variant={TextVariant.bodySm}
             color={TextColor.textAlternative}
@@ -188,7 +199,10 @@ export const EditSpendingCapModal = ({
           submitButtonProps={{
             children: t('save'),
             loading: isModalSaving,
-            disabled: showDecimalError,
+            disabled:
+              showDecimalError ||
+              showSpecialCharacterError ||
+              customSpendingCapInputValue === '',
           }}
         />
       </ModalContent>

From 7a8da64d2116074ce5837b28364513aa1211404c Mon Sep 17 00:00:00 2001
From: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
Date: Mon, 4 Nov 2024 09:09:15 -0500
Subject: [PATCH 013/111] fix: Add different copy for tooltip when a snap is
 requesting a signature (#27492)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change? The tooltip content incorrectly
says "site" when a snap is requesting a signature
2. What is the improvement/solution? Changing the copy to say "snap" for
when a snap is making the signature request.

## **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.
---
 app/_locales/en/messages.json                 |  3 +
 .../info/personal-sign/personal-sign.test.tsx | 96 +++++++++++++++++++
 .../info/personal-sign/personal-sign.tsx      | 12 ++-
 .../info/typed-sign-v1/typed-sign-v1.test.tsx | 62 ++++++++++++
 .../info/typed-sign-v1/typed-sign-v1.tsx      |  6 +-
 .../info/typed-sign/typed-sign.test.tsx       | 62 ++++++++++++
 .../confirm/info/typed-sign/typed-sign.tsx    |  6 +-
 7 files changed, 244 insertions(+), 3 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 4b3c59b52297..61171df6e922 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4438,6 +4438,9 @@
   "requestFromInfo": {
     "message": "This is the site asking for your signature."
   },
+  "requestFromInfoSnap": {
+    "message": "This is the Snap asking for your signature."
+  },
   "requestFromTransactionDescription": {
     "message": "This is the site asking for your confirmation."
   },
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
index 6fe06c81467a..e105493485ec 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
@@ -10,6 +10,8 @@ import {
 } from '../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
 import { signatureRequestSIWE } from '../../../../../../../test/data/confirmations/personal_sign';
+import * as utils from '../../../../utils';
+import * as snapUtils from '../../../../../../helpers/utils/snaps';
 import PersonalSignInfo from './personal-sign';
 
 jest.mock(
@@ -21,6 +23,29 @@ jest.mock(
   }),
 );
 
+jest.mock('../../../../utils', () => {
+  const originalUtils = jest.requireActual('../../../../utils');
+  return {
+    ...originalUtils,
+    isSIWESignatureRequest: jest.fn().mockReturnValue(false),
+  };
+});
+
+jest.mock('../../../../../../../node_modules/@metamask/snaps-utils', () => {
+  const originalUtils = jest.requireActual(
+    '../../../../../../../node_modules/@metamask/snaps-utils',
+  );
+  return {
+    ...originalUtils,
+    stripSnapPrefix: jest.fn().mockReturnValue('@metamask/examplesnap'),
+    getSnapPrefix: jest.fn().mockReturnValue('npm:'),
+  };
+});
+
+jest.mock('../../../../../../helpers/utils/snaps', () => ({
+  isSnapId: jest.fn(),
+}));
+
 describe('PersonalSignInfo', () => {
   it('renders correctly for personal sign request', () => {
     const state = getMockPersonalSignConfirmState();
@@ -62,6 +87,7 @@ describe('PersonalSignInfo', () => {
   });
 
   it('display signing in from for SIWE request', () => {
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(true);
     const state =
       getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE);
     const mockStore = configureMockStore([])(state);
@@ -73,6 +99,7 @@ describe('PersonalSignInfo', () => {
   });
 
   it('display simulation for SIWE request if preference useTransactionSimulations is enabled', () => {
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(true);
     const state = getMockPersonalSignConfirmStateForRequest(
       signatureRequestSIWE,
       {
@@ -88,4 +115,73 @@ describe('PersonalSignInfo', () => {
     );
     expect(getByText('Estimated changes')).toBeDefined();
   });
+
+  it('does not display tooltip text when isSIWE is true', async () => {
+    const state =
+      getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE); // isSIWE is true
+
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(true);
+    const mockStore = configureMockStore([])(state);
+    const { queryByText, getByText } = renderWithConfirmContextProvider(
+      <PersonalSignInfo />,
+      mockStore,
+    );
+
+    const requestFromLabel = getByText('Request from');
+    await requestFromLabel.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+
+    expect(
+      queryByText('This is the site asking for your signature.'),
+    ).toBeNull();
+    expect(
+      queryByText('This is the Snap asking for your signature.'),
+    ).toBeNull();
+  });
+
+  it('displays "requestFromInfoSnap" tooltip when isSIWE is false and origin is a snap', async () => {
+    const state =
+      getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE);
+
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(false);
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+
+    const mockStore = configureMockStore([])(state);
+    const { queryByText, getByText } = renderWithConfirmContextProvider(
+      <PersonalSignInfo />,
+      mockStore,
+    );
+
+    const requestFromLabel = getByText('Request from');
+    await requestFromLabel.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+
+    expect(
+      queryByText('This is the Snap asking for your signature.'),
+    ).toBeDefined();
+  });
+
+  it('displays "requestFromInfo" tooltip when isSIWE is false and origin is not a snap', async () => {
+    const state =
+      getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE);
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(false);
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+
+    const mockStore = configureMockStore([])(state);
+    const { getByText, queryByText } = renderWithConfirmContextProvider(
+      <PersonalSignInfo />,
+      mockStore,
+    );
+
+    const requestFromLabel = getByText('Request from');
+    await requestFromLabel.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+
+    expect(
+      queryByText('This is the site asking for your signature.'),
+    ).toBeDefined();
+  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
index 3199c3d108e0..5eb798439ca8 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
@@ -19,6 +19,7 @@ import { selectUseTransactionSimulations } from '../../../../selectors/preferenc
 import { isSIWESignatureRequest } from '../../../../utils';
 import { ConfirmInfoAlertRow } from '../../../../../../components/app/confirm/info/row/alert-row/alert-row';
 import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
+import { isSnapId } from '../../../../../../helpers/utils/snaps';
 import { SIWESignInfo } from './siwe-sign';
 
 const PersonalSignInfo: React.FC = () => {
@@ -39,6 +40,15 @@ const PersonalSignInfo: React.FC = () => {
     hexToText(currentConfirmation.msgParams?.data),
   );
 
+  let toolTipMessage;
+  if (!isSIWE) {
+    if (isSnapId(currentConfirmation.msgParams.origin)) {
+      toolTipMessage = t('requestFromInfoSnap');
+    } else {
+      toolTipMessage = t('requestFromInfo');
+    }
+  }
+
   return (
     <>
       {isSIWE && useTransactionSimulations && (
@@ -56,7 +66,7 @@ const PersonalSignInfo: React.FC = () => {
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
           label={t('requestFrom')}
-          tooltip={isSIWE ? undefined : t('requestFromInfo')}
+          tooltip={toolTipMessage}
         >
           <ConfirmInfoRowUrl url={currentConfirmation.msgParams.origin} />
         </ConfirmInfoAlertRow>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
index c6801dd91314..2b1e6969ddd5 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
@@ -5,6 +5,7 @@ import { TransactionType } from '@metamask/transaction-controller';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
 import { getMockTypedSignConfirmStateForRequest } from '../../../../../../../test/data/confirmations/helper';
 import { unapprovedTypedSignMsgV1 } from '../../../../../../../test/data/confirmations/typed_sign';
+import * as snapUtils from '../../../../../../helpers/utils/snaps';
 import TypedSignInfoV1 from './typed-sign-v1';
 
 jest.mock(
@@ -16,6 +17,21 @@ jest.mock(
   }),
 );
 
+jest.mock('../../../../../../../node_modules/@metamask/snaps-utils', () => {
+  const originalUtils = jest.requireActual(
+    '../../../../../../../node_modules/@metamask/snaps-utils',
+  );
+  return {
+    ...originalUtils,
+    stripSnapPrefix: jest.fn().mockReturnValue('@metamask/examplesnap'),
+    getSnapPrefix: jest.fn().mockReturnValue('npm:'),
+  };
+});
+
+jest.mock('../../../../../../helpers/utils/snaps', () => ({
+  isSnapId: jest.fn(),
+}));
+
 describe('TypedSignInfo', () => {
   it('correctly renders typed sign data request', () => {
     const mockState = getMockTypedSignConfirmStateForRequest(
@@ -42,4 +58,50 @@ describe('TypedSignInfo', () => {
     );
     expect(container).toMatchInlineSnapshot(`<div />`);
   });
+
+  it('displays "requestFromInfoSnap" tooltip when origin is a snap', async () => {
+    const mockState = getMockTypedSignConfirmStateForRequest({
+      id: '123',
+      type: TransactionType.signTypedData,
+      chainId: '0x5',
+    });
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+    const mockStore = configureMockStore([])(mockState);
+    const { queryByText } = renderWithConfirmContextProvider(
+      <TypedSignInfoV1 />,
+      mockStore,
+    );
+
+    const requestFromLabel = queryByText('Request from');
+
+    await requestFromLabel?.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+    expect(
+      queryByText('This is the Snap asking for your signature.'),
+    ).toBeDefined();
+  });
+
+  it('displays "requestFromInfo" tooltip when origin is not a snap', async () => {
+    const mockState = getMockTypedSignConfirmStateForRequest({
+      id: '123',
+      type: TransactionType.signTypedData,
+      chainId: '0x5',
+    });
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(false);
+    const mockStore = configureMockStore([])(mockState);
+    const { queryByText } = renderWithConfirmContextProvider(
+      <TypedSignInfoV1 />,
+      mockStore,
+    );
+
+    const requestFromLabel = queryByText('Request from');
+
+    await requestFromLabel?.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+    expect(
+      queryByText('This is the site asking for your signature.'),
+    ).toBeDefined();
+  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
index b7bfdba16e8a..eb935d6bdef2 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.tsx
@@ -14,6 +14,7 @@ import {
 import { useConfirmContext } from '../../../../context/confirm';
 import { ConfirmInfoRowTypedSignDataV1 } from '../../row/typed-sign-data-v1/typedSignDataV1';
 import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
+import { isSnapId } from '../../../../../../helpers/utils/snaps';
 
 const TypedSignV1Info: React.FC = () => {
   const t = useI18nContext();
@@ -23,6 +24,9 @@ const TypedSignV1Info: React.FC = () => {
     return null;
   }
 
+  const toolTipMessage = isSnapId(currentConfirmation.msgParams?.origin)
+    ? t('requestFromInfoSnap')
+    : t('requestFromInfo');
   const chainId = currentConfirmation.chainId as string;
 
   return (
@@ -32,7 +36,7 @@ const TypedSignV1Info: React.FC = () => {
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
           label={t('requestFrom')}
-          tooltip={t('requestFromInfo')}
+          tooltip={toolTipMessage}
         >
           <ConfirmInfoRowUrl
             url={currentConfirmation.msgParams?.origin ?? ''}
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
index 86826c5a60b0..e6c93e964687 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
@@ -16,6 +16,7 @@ import {
   unapprovedTypedSignMsgV3,
 } from '../../../../../../../test/data/confirmations/typed_sign';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
+import * as snapUtils from '../../../../../../helpers/utils/snaps';
 import TypedSignInfo from './typed-sign';
 
 jest.mock(
@@ -33,6 +34,21 @@ jest.mock('../../../../../../store/actions', () => {
   };
 });
 
+jest.mock('../../../../../../../node_modules/@metamask/snaps-utils', () => {
+  const originalUtils = jest.requireActual(
+    '../../../../../../../node_modules/@metamask/snaps-utils',
+  );
+  return {
+    ...originalUtils,
+    stripSnapPrefix: jest.fn().mockReturnValue('@metamask/examplesnap'),
+    getSnapPrefix: jest.fn().mockReturnValue('npm:'),
+  };
+});
+
+jest.mock('../../../../../../helpers/utils/snaps', () => ({
+  isSnapId: jest.fn(),
+}));
+
 describe('TypedSignInfo', () => {
   it('renders origin for typed sign data request', () => {
     const state = getMockTypedSignConfirmState();
@@ -127,4 +143,50 @@ describe('TypedSignInfo', () => {
     );
     expect(container).toMatchSnapshot();
   });
+
+  it('displays "requestFromInfoSnap" tooltip when origin is a snap', async () => {
+    const mockState = getMockTypedSignConfirmStateForRequest({
+      id: '123',
+      type: TransactionType.signTypedData,
+      chainId: '0x5',
+    });
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+    const mockStore = configureMockStore([])(mockState);
+    const { queryByText } = renderWithConfirmContextProvider(
+      <TypedSignInfo />,
+      mockStore,
+    );
+
+    const requestFromLabel = queryByText('Request from');
+
+    await requestFromLabel?.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+    expect(
+      queryByText('This is the Snap asking for your signature.'),
+    ).toBeDefined();
+  });
+
+  it('displays "requestFromInfo" tooltip when origin is not a snap', async () => {
+    const mockState = getMockTypedSignConfirmStateForRequest({
+      id: '123',
+      type: TransactionType.signTypedData,
+      chainId: '0x5',
+    });
+    (snapUtils.isSnapId as jest.Mock).mockReturnValue(false);
+    const mockStore = configureMockStore([])(mockState);
+    const { queryByText } = renderWithConfirmContextProvider(
+      <TypedSignInfo />,
+      mockStore,
+    );
+
+    const requestFromLabel = queryByText('Request from');
+
+    await requestFromLabel?.dispatchEvent(
+      new MouseEvent('mouseenter', { bubbles: true }),
+    );
+    expect(
+      queryByText('This is the site asking for your signature.'),
+    ).toBeDefined();
+  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
index c1830b05bd4a..fa5e61caef1f 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -22,6 +22,7 @@ import { fetchErc20Decimals } from '../../../../utils/token';
 import { useConfirmContext } from '../../../../context/confirm';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
 import { ConfirmInfoRowTypedSignData } from '../../row/typed-sign-data/typedSignData';
+import { isSnapId } from '../../../../../../helpers/utils/snaps';
 import { PermitSimulation } from './permit-simulation';
 
 const TypedSignInfo: React.FC = () => {
@@ -55,6 +56,9 @@ const TypedSignInfo: React.FC = () => {
     })();
   }, [verifyingContract]);
 
+  const toolTipMessage = isSnapId(currentConfirmation.msgParams.origin)
+    ? t('requestFromInfoSnap')
+    : t('requestFromInfo');
   const msgData = currentConfirmation.msgParams?.data as string;
 
   return (
@@ -73,7 +77,7 @@ const TypedSignInfo: React.FC = () => {
           alertKey={RowAlertKey.RequestFrom}
           ownerId={currentConfirmation.id}
           label={t('requestFrom')}
-          tooltip={t('requestFromInfo')}
+          tooltip={toolTipMessage}
         >
           <ConfirmInfoRowUrl url={currentConfirmation.msgParams.origin} />
         </ConfirmInfoAlertRow>

From 77b77a83801bb6c621e0acd4e35b8d0b2e8a938e Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Mon, 4 Nov 2024 10:43:59 -0500
Subject: [PATCH 014/111] refactor: move `getInternalAccounts` from
 `selectors.js` to `accounts.ts` (#27645)
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/27645?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.
 -->
---
 .../interactive-replacement-token-page.tsx               | 2 ++
 .../notifications-settings/notifications-settings.tsx    | 2 +-
 ui/selectors/accounts.test.ts                            | 9 +++++++++
 ui/selectors/accounts.ts                                 | 5 ++++-
 ui/selectors/selectors.js                                | 6 +-----
 ui/selectors/selectors.test.js                           | 8 --------
 ui/selectors/snaps/accounts.ts                           | 3 ++-
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
index c12bb0aedf57..01ec70c93025 100644
--- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
+++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.tsx
@@ -154,6 +154,7 @@ const InteractiveReplacementTokenPage: React.FC = () => {
 
         const filteredAccounts = custodianAccounts.filter(
           (account: TokenAccount) =>
+            // @ts-expect-error metaMaskAccounts isn't a real type
             metaMaskAccounts[account.address.toLowerCase()],
         );
 
@@ -163,6 +164,7 @@ const InteractiveReplacementTokenPage: React.FC = () => {
             name: account.name,
             labels: account.labels,
             balance:
+              // @ts-expect-error metaMaskAccounts isn't a real type
               metaMaskAccounts[account.address.toLowerCase()]?.balance || 0,
           }),
         );
diff --git a/ui/pages/notifications-settings/notifications-settings.tsx b/ui/pages/notifications-settings/notifications-settings.tsx
index d929f048a793..0fafb468b733 100644
--- a/ui/pages/notifications-settings/notifications-settings.tsx
+++ b/ui/pages/notifications-settings/notifications-settings.tsx
@@ -57,7 +57,7 @@ export default function NotificationsSettings() {
   const isUpdatingMetamaskNotifications = useSelector(
     getIsUpdatingMetamaskNotifications,
   );
-  const accounts: AccountType[] = useSelector(getInternalAccounts);
+  const accounts = useSelector(getInternalAccounts) as AccountType[];
 
   // States
   const [loadingAllowNotifications, setLoadingAllowNotifications] =
diff --git a/ui/selectors/accounts.test.ts b/ui/selectors/accounts.test.ts
index 639da0185b72..033d88c30faa 100644
--- a/ui/selectors/accounts.test.ts
+++ b/ui/selectors/accounts.test.ts
@@ -15,6 +15,7 @@ import {
   hasCreatedBtcMainnetAccount,
   hasCreatedBtcTestnetAccount,
   getSelectedInternalAccount,
+  getInternalAccounts,
 } from './accounts';
 
 const MOCK_STATE: AccountsState = {
@@ -27,6 +28,14 @@ const MOCK_STATE: AccountsState = {
 };
 
 describe('Accounts Selectors', () => {
+  describe('#getInternalAccounts', () => {
+    it('returns a list of internal accounts', () => {
+      expect(getInternalAccounts(mockState as AccountsState)).toStrictEqual(
+        Object.values(mockState.metamask.internalAccounts.accounts),
+      );
+    });
+  });
+
   describe('#getSelectedInternalAccount', () => {
     it('returns selected internalAccount', () => {
       expect(
diff --git a/ui/selectors/accounts.ts b/ui/selectors/accounts.ts
index d69cd130f9aa..af977b7511da 100644
--- a/ui/selectors/accounts.ts
+++ b/ui/selectors/accounts.ts
@@ -8,7 +8,6 @@ import {
   isBtcMainnetAddress,
   isBtcTestnetAddress,
 } from '../../shared/lib/multichain';
-import { getInternalAccounts } from './selectors';
 
 export type AccountsState = {
   metamask: AccountsControllerState;
@@ -20,6 +19,10 @@ function isBtcAccount(account: InternalAccount) {
   return Boolean(account && account.type === P2wpkh);
 }
 
+export function getInternalAccounts(state: AccountsState) {
+  return Object.values(state.metamask.internalAccounts.accounts);
+}
+
 export function getSelectedInternalAccount(state: AccountsState) {
   const accountId = state.metamask.internalAccounts.selectedAccount;
   return state.metamask.internalAccounts.accounts[accountId];
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 4ea9f20371ab..a548a9f33dcc 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -117,7 +117,7 @@ import {
   getOrderedConnectedAccountsForConnectedDapp,
   getSubjectMetadata,
 } from './permissions';
-import { getSelectedInternalAccount } from './accounts';
+import { getSelectedInternalAccount, getInternalAccounts } from './accounts';
 import { createDeepEqualSelector } from './util';
 import { getMultichainBalances, getMultichainNetwork } from './multichain';
 
@@ -371,10 +371,6 @@ export function getSelectedInternalAccountWithBalance(state) {
   return selectedAccountWithBalance;
 }
 
-export function getInternalAccounts(state) {
-  return Object.values(state.metamask.internalAccounts.accounts);
-}
-
 export function getInternalAccount(state, accountId) {
   return state.metamask.internalAccounts.accounts[accountId];
 }
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 459864c1e1f3..d6656e481709 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -113,14 +113,6 @@ describe('Selectors', () => {
     });
   });
 
-  describe('#getInternalAccounts', () => {
-    it('returns a list of internal accounts', () => {
-      expect(selectors.getInternalAccounts(mockState)).toStrictEqual(
-        Object.values(mockState.metamask.internalAccounts.accounts),
-      );
-    });
-  });
-
   describe('#getInternalAccount', () => {
     it("returns undefined if the account doesn't exist", () => {
       expect(
diff --git a/ui/selectors/snaps/accounts.ts b/ui/selectors/snaps/accounts.ts
index b47f33726429..55a30f0c72eb 100644
--- a/ui/selectors/snaps/accounts.ts
+++ b/ui/selectors/snaps/accounts.ts
@@ -1,6 +1,7 @@
 import { createSelector } from 'reselect';
 import { AccountsControllerState } from '@metamask/accounts-controller';
-import { getAccountName, getInternalAccounts } from '../selectors';
+import { getAccountName } from '../selectors';
+import { getInternalAccounts } from '../accounts';
 import { createDeepEqualSelector } from '../util';
 
 /**

From eab6233bff0e5bbc013248e2eb725a788572b1ba Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Mon, 4 Nov 2024 07:52:20 -0800
Subject: [PATCH 015/111] feat: multi chain polling for token prices (#28158)
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**

Multi chain polling for the token rates controller. This will fetch
erc20 token prices across all evm chains.


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

## **Related issues**

## **Manual testing steps**

no visual changes, you should just see the network tab hitting price api
across multiple chains, correct prices when switching chains, when
adding new tokens, and `marketData` updated in state across chains

## **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: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
---
 ...s-controllers-npm-42.0.0-57b3d695bb.patch} |  0
 app/scripts/metamask-controller.js            | 28 +++++----
 package.json                                  |  2 +-
 ui/contexts/assetPolling.tsx                  | 13 +++++
 ui/contexts/currencyRate.js                   | 13 -----
 ui/hooks/useMultiPolling.ts                   | 57 +++++++++++++++++++
 ui/hooks/useTokenRatesPolling.ts              | 40 +++++++++++++
 ui/pages/index.js                             |  6 +-
 ui/selectors/selectors.js                     | 16 ++++++
 ui/store/actions.ts                           | 31 ++++++++++
 yarn.lock                                     | 18 +++---
 11 files changed, 183 insertions(+), 41 deletions(-)
 rename .yarn/patches/{@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch => @metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch} (100%)
 create mode 100644 ui/contexts/assetPolling.tsx
 delete mode 100644 ui/contexts/currencyRate.js
 create mode 100644 ui/hooks/useMultiPolling.ts
 create mode 100644 ui/hooks/useTokenRatesPolling.ts

diff --git a/.yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch b/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch
similarity index 100%
rename from .yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch
rename to .yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 009f87634caa..b43ef72cae5c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1007,6 +1007,7 @@ export default class MetamaskController extends EventEmitter {
       state: initState.TokenRatesController,
       messenger: tokenRatesMessenger,
       tokenPricesService: new CodefiTokenPricesServiceV2(),
+      disabled: !this.preferencesController.state.useCurrencyRateCheck,
     });
 
     this.controllerMessenger.subscribe(
@@ -1015,9 +1016,9 @@ export default class MetamaskController extends EventEmitter {
         const { useCurrencyRateCheck: prevUseCurrencyRateCheck } = prevState;
         const { useCurrencyRateCheck: currUseCurrencyRateCheck } = currState;
         if (currUseCurrencyRateCheck && !prevUseCurrencyRateCheck) {
-          this.tokenRatesController.start();
+          this.tokenRatesController.enable();
         } else if (!currUseCurrencyRateCheck && prevUseCurrencyRateCheck) {
-          this.tokenRatesController.stop();
+          this.tokenRatesController.disable();
         }
       }, this.preferencesController.state),
     );
@@ -2590,12 +2591,6 @@ export default class MetamaskController extends EventEmitter {
 
     const preferencesControllerState = this.preferencesController.state;
 
-    const { useCurrencyRateCheck } = preferencesControllerState;
-
-    if (useCurrencyRateCheck) {
-      this.tokenRatesController.start();
-    }
-
     if (this.#isTokenListPollingRequired(preferencesControllerState)) {
       this.tokenListController.start();
     }
@@ -2608,12 +2603,6 @@ export default class MetamaskController extends EventEmitter {
 
     const preferencesControllerState = this.preferencesController.state;
 
-    const { useCurrencyRateCheck } = preferencesControllerState;
-
-    if (useCurrencyRateCheck) {
-      this.tokenRatesController.stop();
-    }
-
     if (this.#isTokenListPollingRequired(preferencesControllerState)) {
       this.tokenListController.stop();
     }
@@ -3250,6 +3239,7 @@ export default class MetamaskController extends EventEmitter {
       backup,
       approvalController,
       phishingController,
+      tokenRatesController,
       // Notification Controllers
       authenticationController,
       userStorageController,
@@ -4016,6 +4006,13 @@ export default class MetamaskController extends EventEmitter {
           currencyRateController,
         ),
 
+      tokenRatesStartPolling:
+        tokenRatesController.startPolling.bind(tokenRatesController),
+      tokenRatesStopPollingByPollingToken:
+        tokenRatesController.stopPollingByPollingToken.bind(
+          tokenRatesController,
+        ),
+
       // GasFeeController
       gasFeeStartPollingByNetworkClientId:
         gasFeeController.startPollingByNetworkClientId.bind(gasFeeController),
@@ -6641,12 +6638,13 @@ export default class MetamaskController extends EventEmitter {
 
   /**
    * A method that is called by the background when all instances of metamask are closed.
-   * Currently used to stop polling in the gasFeeController.
+   * Currently used to stop controller polling.
    */
   onClientClosed() {
     try {
       this.gasFeeController.stopAllPolling();
       this.currencyRateController.stopAllPolling();
+      this.tokenRatesController.stopAllPolling();
       this.appStateController.clearPollingTokens();
     } catch (error) {
       console.error(error);
diff --git a/package.json b/package.json
index 4b30ab0948c8..cad47b45c8f3 100644
--- a/package.json
+++ b/package.json
@@ -286,7 +286,7 @@
     "@metamask/address-book-controller": "^6.0.0",
     "@metamask/announcement-controller": "^7.0.0",
     "@metamask/approval-controller": "^7.0.0",
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A41.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch",
     "@metamask/base-controller": "^7.0.0",
     "@metamask/bitcoin-wallet-snap": "^0.8.2",
     "@metamask/browser-passworder": "^4.3.0",
diff --git a/ui/contexts/assetPolling.tsx b/ui/contexts/assetPolling.tsx
new file mode 100644
index 000000000000..63cef9667fbd
--- /dev/null
+++ b/ui/contexts/assetPolling.tsx
@@ -0,0 +1,13 @@
+import React, { ReactNode } from 'react';
+import useCurrencyRatePolling from '../hooks/useCurrencyRatePolling';
+import useTokenRatesPolling from '../hooks/useTokenRatesPolling';
+
+// This provider is a step towards making controller polling fully UI based.
+// Eventually, individual UI components will call the use*Polling hooks to
+// poll and return particular data. This polls globally in the meantime.
+export const AssetPollingProvider = ({ children }: { children: ReactNode }) => {
+  useCurrencyRatePolling();
+  useTokenRatesPolling();
+
+  return <>{children}</>;
+};
diff --git a/ui/contexts/currencyRate.js b/ui/contexts/currencyRate.js
deleted file mode 100644
index 6739b730a882..000000000000
--- a/ui/contexts/currencyRate.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import useCurrencyRatePolling from '../hooks/useCurrencyRatePolling';
-
-export const CurrencyRateProvider = ({ children }) => {
-  useCurrencyRatePolling();
-
-  return <>{children}</>;
-};
-
-CurrencyRateProvider.propTypes = {
-  children: PropTypes.node,
-};
diff --git a/ui/hooks/useMultiPolling.ts b/ui/hooks/useMultiPolling.ts
new file mode 100644
index 000000000000..f0b3ed33cdfc
--- /dev/null
+++ b/ui/hooks/useMultiPolling.ts
@@ -0,0 +1,57 @@
+import { useEffect, useState } from 'react';
+
+type UseMultiPollingOptions<PollingInput> = {
+  startPolling: (input: PollingInput) => Promise<string>;
+  stopPollingByPollingToken: (pollingToken: string) => void;
+  input: PollingInput[];
+};
+
+// A hook that manages multiple polling loops of a polling controller.
+// Callers provide an array of inputs, and the hook manages starting
+// and stopping polling loops for each input.
+const useMultiPolling = <PollingInput>(
+  usePollingOptions: UseMultiPollingOptions<PollingInput>,
+) => {
+  const [polls, setPolls] = useState(new Map());
+
+  useEffect(() => {
+    // start new polls
+    for (const input of usePollingOptions.input) {
+      const key = JSON.stringify(input);
+      if (!polls.has(key)) {
+        usePollingOptions
+          .startPolling(input)
+          .then((token) =>
+            setPolls((prevPolls) => new Map(prevPolls).set(key, token)),
+          );
+      }
+    }
+
+    // stop existing polls
+    for (const [inputKey, token] of polls.entries()) {
+      const exists = usePollingOptions.input.some(
+        (i) => inputKey === JSON.stringify(i),
+      );
+
+      if (!exists) {
+        usePollingOptions.stopPollingByPollingToken(token);
+        setPolls((prevPolls) => {
+          const newPolls = new Map(prevPolls);
+          newPolls.delete(inputKey);
+          return newPolls;
+        });
+      }
+    }
+  }, [usePollingOptions.input && JSON.stringify(usePollingOptions.input)]);
+
+  // stop all polling on dismount
+  useEffect(() => {
+    return () => {
+      for (const token of polls.values()) {
+        usePollingOptions.stopPollingByPollingToken(token);
+      }
+    };
+  }, []);
+};
+
+export default useMultiPolling;
diff --git a/ui/hooks/useTokenRatesPolling.ts b/ui/hooks/useTokenRatesPolling.ts
new file mode 100644
index 000000000000..41c1c8793b97
--- /dev/null
+++ b/ui/hooks/useTokenRatesPolling.ts
@@ -0,0 +1,40 @@
+import { useSelector } from 'react-redux';
+import {
+  getMarketData,
+  getNetworkConfigurationsByChainId,
+  getTokenExchangeRates,
+  getTokensMarketData,
+  getUseCurrencyRateCheck,
+} from '../selectors';
+import {
+  tokenRatesStartPolling,
+  tokenRatesStopPollingByPollingToken,
+} from '../store/actions';
+import useMultiPolling from './useMultiPolling';
+
+const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
+  // Selectors to determine polling input
+  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
+  const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
+
+  // Selectors returning state updated by the polling
+  const tokenExchangeRates = useSelector(getTokenExchangeRates);
+  const tokensMarketData = useSelector(getTokensMarketData);
+  const marketData = useSelector(getMarketData);
+
+  useMultiPolling({
+    startPolling: tokenRatesStartPolling,
+    stopPollingByPollingToken: tokenRatesStopPollingByPollingToken,
+    input: useCurrencyRateCheck
+      ? chainIds ?? Object.keys(networkConfigurations)
+      : [],
+  });
+
+  return {
+    tokenExchangeRates,
+    tokensMarketData,
+    marketData,
+  };
+};
+
+export default useTokenRatesPolling;
diff --git a/ui/pages/index.js b/ui/pages/index.js
index 0b1cdcef78cd..c30846fff1e6 100644
--- a/ui/pages/index.js
+++ b/ui/pages/index.js
@@ -10,7 +10,7 @@ import {
   LegacyMetaMetricsProvider,
 } from '../contexts/metametrics';
 import { MetamaskNotificationsProvider } from '../contexts/metamask-notifications';
-import { CurrencyRateProvider } from '../contexts/currencyRate';
+import { AssetPollingProvider } from '../contexts/assetPolling';
 import ErrorPage from './error';
 import Routes from './routes';
 
@@ -49,11 +49,11 @@ class Index extends PureComponent {
               <LegacyMetaMetricsProvider>
                 <I18nProvider>
                   <LegacyI18nProvider>
-                    <CurrencyRateProvider>
+                    <AssetPollingProvider>
                       <MetamaskNotificationsProvider>
                         <Routes />
                       </MetamaskNotificationsProvider>
-                    </CurrencyRateProvider>
+                    </AssetPollingProvider>
                   </LegacyI18nProvider>
                 </I18nProvider>
               </LegacyMetaMetricsProvider>
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index a548a9f33dcc..70e970c4c9b3 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -578,11 +578,27 @@ export const getTokenExchangeRates = (state) => {
   );
 };
 
+/**
+ * Get market data for tokens on the current chain
+ *
+ * @param state
+ * @returns {Record<Hex, import('@metamask/assets-controllers').MarketDataDetails>}
+ */
 export const getTokensMarketData = (state) => {
   const chainId = getCurrentChainId(state);
   return state.metamask.marketData?.[chainId];
 };
 
+/**
+ * Get market data for tokens across all chains
+ *
+ * @param state
+ * @returns {Record<Hex, Record<Hex, import('@metamask/assets-controllers').MarketDataDetails>>}
+ */
+export const getMarketData = (state) => {
+  return state.metamask.marketData;
+};
+
 export function getAddressBook(state) {
   const chainId = getCurrentChainId(state);
   if (!state.metamask.addressBook[chainId]) {
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 77189e9683af..886739d2d54f 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4555,6 +4555,37 @@ export async function currencyRateStopPollingByPollingToken(
   await removePollingTokenFromAppState(pollingToken);
 }
 
+/**
+ * Informs the TokenRatesController that the UI requires
+ * token rate polling for the given chain id.
+ *
+ * @param chainId - The chain id to poll token rates on.
+ * @returns polling token that can be used to stop polling
+ */
+export async function tokenRatesStartPolling(chainId: string): Promise<string> {
+  const pollingToken = await submitRequestToBackground(
+    'tokenRatesStartPolling',
+    [{ chainId }],
+  );
+  await addPollingTokenToAppState(pollingToken);
+  return pollingToken;
+}
+
+/**
+ * Informs the TokenRatesController that the UI no longer
+ * requires token rate polling for the given chain id.
+ *
+ * @param pollingToken -
+ */
+export async function tokenRatesStopPollingByPollingToken(
+  pollingToken: string,
+) {
+  await submitRequestToBackground('tokenRatesStopPollingByPollingToken', [
+    pollingToken,
+  ]);
+  await removePollingTokenFromAppState(pollingToken);
+}
+
 /**
  * Informs the GasFeeController that the UI requires gas fee polling
  *
diff --git a/yarn.lock b/yarn.lock
index 7890bcaa7b3f..a1f4dfe4ea4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4772,9 +4772,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:41.0.0":
-  version: 41.0.0
-  resolution: "@metamask/assets-controllers@npm:41.0.0"
+"@metamask/assets-controllers@npm:42.0.0":
+  version: 42.0.0
+  resolution: "@metamask/assets-controllers@npm:42.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/address": "npm:^5.7.0"
@@ -4806,13 +4806,13 @@ __metadata:
     "@metamask/keyring-controller": ^17.0.0
     "@metamask/network-controller": ^22.0.0
     "@metamask/preferences-controller": ^13.0.0
-  checksum: 10/63f1a9605d692217889511ca161ee614d8e12d7f7233773afb34c4fb6323fad1c29b3a4ee920ef6f84e4b165ffb8764dfd105bdc9bad75084f52a7c876faa4f5
+  checksum: 10/64d2bd43139ee5c19bd665b07212cd5d5dd41b457dedde3b5db31442292c4d064dc015011f5f001bb423683675fb20898ff652e91d2339ad1d21cc45fa93487a
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A41.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch":
-  version: 41.0.0
-  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A41.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch::version=41.0.0&hash=e14ff8"
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch":
+  version: 42.0.0
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch::version=42.0.0&hash=e14ff8"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/address": "npm:^5.7.0"
@@ -4844,7 +4844,7 @@ __metadata:
     "@metamask/keyring-controller": ^17.0.0
     "@metamask/network-controller": ^22.0.0
     "@metamask/preferences-controller": ^13.0.0
-  checksum: 10/f7d609be61f4e952abd78d996a44131941f1fcd476066d007bed5047d1c887d38e9e9cf117eeb963148674fd9ad6ae87c8384bc8a21d4281628aaab1b60ce7a8
+  checksum: 10/9a6727b28f88fd2df3f4b1628dd5d8c2f3e73fd4b9cd090f22d175c2522faa6c6b7e9a93d0ec2b2d123a263c8f4116fbfe97f196b99401b28ac8597f522651eb
   languageName: node
   linkType: hard
 
@@ -26397,7 +26397,7 @@ __metadata:
     "@metamask/announcement-controller": "npm:^7.0.0"
     "@metamask/api-specs": "npm:^0.9.3"
     "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A41.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-41.0.0-57b3d695bb.patch"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^7.0.0"
     "@metamask/bitcoin-wallet-snap": "npm:^0.8.2"

From 08d1854986101fce1b8442a4fe00481ef443b74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 4 Nov 2024 17:14:53 +0000
Subject: [PATCH 016/111] feat: adds the experimental toggle for Solana 
 (#28190)
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 sdds a new experimental toggle for Solana accounts. Everything
is code fenced for Flask build.

![Screenshot 2024-10-31 at 11 50
38](https://github.com/user-attachments/assets/8e6a290c-b22d-42a7-8602-ac61410ebdb4)


## **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/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/en/messages.json                 |  9 ++++
 .../preferences-controller.test.ts            | 15 ++++++
 .../controllers/preferences-controller.ts     | 20 ++++++++
 app/scripts/metamask-controller.js            |  4 ++
 shared/constants/metametrics.ts               |  1 +
 .../experimental-tab.component.tsx            | 47 +++++++++++++++++++
 .../experimental-tab.container.ts             | 12 +++++
 .../experimental-tab/experimental-tab.test.js | 19 +++++++-
 ui/selectors/selectors.js                     | 12 +++++
 ui/store/actions.ts                           | 10 ++++
 10 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 61171df6e922..08675837b34d 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -5224,6 +5224,15 @@
     "message": "Contact the creators of $1 for further support.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Turning on this feature will give you the option to add a Solana Account to your MetaMask Extension derived from your existing Secret Recovery Phrase. This is an experimental Beta feature, so you should use it at your own risk."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Enable \"Add a new Solana account (Beta)\""
+  },
   "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/app/scripts/controllers/preferences-controller.test.ts b/app/scripts/controllers/preferences-controller.test.ts
index 74daf39e17ad..a4b91a8d3b1a 100644
--- a/app/scripts/controllers/preferences-controller.test.ts
+++ b/app/scripts/controllers/preferences-controller.test.ts
@@ -853,4 +853,19 @@ describe('preferences controller', () => {
       );
     });
   });
+
+  describe('setSolanaSupportEnabled', () => {
+    const { controller } = setupController({});
+    it('has the default value as false', () => {
+      expect(controller.state.solanaSupportEnabled).toStrictEqual(false);
+    });
+
+    it('sets the solanaSupportEnabled property in state to true and then false', () => {
+      controller.setSolanaSupportEnabled(true);
+      expect(controller.state.solanaSupportEnabled).toStrictEqual(true);
+
+      controller.setSolanaSupportEnabled(false);
+      expect(controller.state.solanaSupportEnabled).toStrictEqual(false);
+    });
+  });
 });
diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index f6537952d651..e1cdb2e8a4f6 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -140,6 +140,7 @@ export type PreferencesControllerState = Omit<
   useRequestQueue: boolean;
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   watchEthereumAccountEnabled: boolean;
+  solanaSupportEnabled: boolean;
   ///: END:ONLY_INCLUDE_IF
   bitcoinSupportEnabled: boolean;
   bitcoinTestnetSupportEnabled: boolean;
@@ -184,6 +185,9 @@ export const getDefaultPreferencesControllerState =
     openSeaEnabled: true,
     securityAlertsEnabled: true,
     watchEthereumAccountEnabled: false,
+    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    solanaSupportEnabled: false,
+    ///: END:ONLY_INCLUDE_IF
     bitcoinSupportEnabled: false,
     bitcoinTestnetSupportEnabled: false,
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
@@ -340,6 +344,10 @@ const controllerMetadata = {
     persist: true,
     anonymous: false,
   },
+  solanaSupportEnabled: {
+    persist: true,
+    anonymous: false,
+  },
   bitcoinSupportEnabled: {
     persist: true,
     anonymous: false,
@@ -669,6 +677,18 @@ export class PreferencesController extends BaseController<
       state.watchEthereumAccountEnabled = watchEthereumAccountEnabled;
     });
   }
+
+  /**
+   * Setter for the `solanaSupportEnabled` property.
+   *
+   * @param solanaSupportEnabled - Whether or not the user wants to
+   * enable the "Add a new Solana account" button.
+   */
+  setSolanaSupportEnabled(solanaSupportEnabled: boolean): void {
+    this.update((state) => {
+      state.solanaSupportEnabled = solanaSupportEnabled;
+    });
+  }
   ///: END:ONLY_INCLUDE_IF
 
   /**
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b43ef72cae5c..a85233ca5119 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3315,6 +3315,10 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setWatchEthereumAccountEnabled.bind(
           preferencesController,
         ),
+      setSolanaSupportEnabled:
+        preferencesController.setSolanaSupportEnabled.bind(
+          preferencesController,
+        ),
       ///: END:ONLY_INCLUDE_IF
       setBitcoinSupportEnabled:
         preferencesController.setBitcoinSupportEnabled.bind(
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 2d6a87b7d1c6..4a5c21ab5752 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -607,6 +607,7 @@ export enum MetaMetricsEventName {
   BridgeLinkClicked = 'Bridge Link Clicked',
   BitcoinSupportToggled = 'Bitcoin Support Toggled',
   BitcoinTestnetSupportToggled = 'Bitcoin Testnet Support Toggled',
+  SolanaSupportToggled = 'Solana Support Toggled',
   CurrentCurrency = 'Current Currency',
   DappViewed = 'Dapp Viewed',
   DecryptionApproved = 'Decryption Approved',
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.tsx b/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
index f1d1f610a7a4..0771428474d5 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
@@ -36,6 +36,10 @@ import { SurveyUrl } from '../../../../shared/constants/urls';
 type ExperimentalTabProps = {
   watchAccountEnabled: boolean;
   setWatchAccountEnabled: (value: boolean) => void;
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  solanaSupportEnabled: boolean;
+  setSolanaSupportEnabled: (value: boolean) => void;
+  ///: END:ONLY_INCLUDE_IF
   bitcoinSupportEnabled: boolean;
   setBitcoinSupportEnabled: (value: boolean) => void;
   bitcoinTestnetSupportEnabled: boolean;
@@ -369,6 +373,44 @@ export default class ExperimentalTab extends PureComponent<ExperimentalTabProps>
       </>
     );
   }
+
+  renderSolanaSupport() {
+    const { t, trackEvent } = this.context;
+    const { solanaSupportEnabled, setSolanaSupportEnabled } = this.props;
+
+    return (
+      <>
+        <Text
+          variant={TextVariant.headingSm}
+          as="h4"
+          color={TextColor.textAlternative}
+          marginBottom={2}
+          fontWeight={FontWeight.Bold}
+        >
+          {t('solanaSupportSectionTitle')}
+        </Text>
+        {this.renderToggleSection({
+          title: t('solanaSupportToggleTitle'),
+          description: t('solanaSupportToggleDescription'),
+          toggleValue: solanaSupportEnabled,
+          toggleCallback: (value) => {
+            trackEvent({
+              event: MetaMetricsEventName.SolanaSupportToggled,
+              category: MetaMetricsEventCategory.Settings,
+              properties: {
+                enabled: !value,
+              },
+            });
+            setSolanaSupportEnabled(!value);
+          },
+          toggleContainerDataTestId: 'solana-support-toggle-div',
+          toggleDataTestId: 'solana-support-toggle',
+          toggleOffLabel: t('off'),
+          toggleOnLabel: t('on'),
+        })}
+      </>
+    );
+  }
   ///: END:ONLY_INCLUDE_IF
 
   render() {
@@ -398,6 +440,11 @@ export default class ExperimentalTab extends PureComponent<ExperimentalTabProps>
           this.renderBitcoinSupport()
           ///: END:ONLY_INCLUDE_IF
         }
+        {
+          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+          this.renderSolanaSupport()
+          ///: END:ONLY_INCLUDE_IF
+        }
       </div>
     );
   }
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.ts b/ui/pages/settings/experimental-tab/experimental-tab.container.ts
index f4d408565bfd..e3be762afd1c 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.ts
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.ts
@@ -13,8 +13,14 @@ import {
   setRedesignedConfirmationsEnabled,
   setRedesignedTransactionsEnabled,
   setWatchEthereumAccountEnabled,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  setSolanaSupportEnabled,
+  ///: END:ONLY_INCLUDE_IF
 } from '../../../store/actions';
 import {
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  getIsSolanaSupportEnabled,
+  ///: END:ONLY_INCLUDE_IF
   getIsBitcoinSupportEnabled,
   getIsBitcoinTestnetSupportEnabled,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
@@ -37,6 +43,9 @@ const mapStateToProps = (state: MetaMaskReduxState) => {
   const petnamesEnabled = getPetnamesEnabled(state);
   const featureNotificationsEnabled = getFeatureNotificationsEnabled(state);
   return {
+    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    solanaSupportEnabled: getIsSolanaSupportEnabled(state),
+    ///: END:ONLY_INCLUDE_IF
     watchAccountEnabled: getIsWatchEthereumAccountEnabled(state),
     bitcoinSupportEnabled: getIsBitcoinSupportEnabled(state),
     bitcoinTestnetSupportEnabled: getIsBitcoinTestnetSupportEnabled(state),
@@ -55,6 +64,9 @@ const mapDispatchToProps = (dispatch: MetaMaskReduxDispatch) => {
   return {
     setWatchAccountEnabled: (value: boolean) =>
       setWatchEthereumAccountEnabled(value),
+    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    setSolanaSupportEnabled: (value: boolean) => setSolanaSupportEnabled(value),
+    ///: END:ONLY_INCLUDE_IF
     setBitcoinSupportEnabled: (value: boolean) =>
       setBitcoinSupportEnabled(value),
     setBitcoinTestnetSupportEnabled: (value: boolean) =>
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.test.js b/ui/pages/settings/experimental-tab/experimental-tab.test.js
index 784b2dc3b5d3..08d02bf94215 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.test.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.test.js
@@ -30,7 +30,7 @@ describe('ExperimentalTab', () => {
     const { getAllByRole } = render();
     const toggle = getAllByRole('checkbox');
 
-    expect(toggle).toHaveLength(8);
+    expect(toggle).toHaveLength(9);
   });
 
   it('enables add account snap', async () => {
@@ -108,4 +108,21 @@ describe('ExperimentalTab', () => {
       expect(setBitcoinSupportEnabled).toHaveBeenNthCalledWith(1, true);
     });
   });
+
+  it('enables the experimental solana account feature', async () => {
+    const setSolanaSupportEnabled = jest.fn();
+    const { getByTestId } = render(
+      {},
+      {
+        setSolanaSupportEnabled,
+        solanaSupportEnabled: false,
+      },
+    );
+    const toggle = getByTestId('solana-support-toggle');
+
+    fireEvent.click(toggle);
+    await waitFor(() => {
+      expect(setSolanaSupportEnabled).toHaveBeenNthCalledWith(1, true);
+    });
+  });
 });
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 70e970c4c9b3..8b44dd715aba 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -2364,6 +2364,18 @@ export function getIsBitcoinSupportEnabled(state) {
   return state.metamask.bitcoinSupportEnabled;
 }
 
+///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+/**
+ * Get the state of the `solanaSupportEnabled` flag.
+ *
+ * @param {*} state
+ * @returns The state of the `solanaSupportEnabled` flag.
+ */
+export function getIsSolanaSupportEnabled(state) {
+  return state.metamask.solanaSupportEnabled;
+}
+///: END:ONLY_INCLUDE_IF
+
 /**
  * Get the state of the `bitcoinTestnetSupportEnabled` flag.
  *
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 886739d2d54f..11df6a3f3e20 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -5002,6 +5002,16 @@ export async function setBitcoinTestnetSupportEnabled(value: boolean) {
   }
 }
 
+///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+export async function setSolanaSupportEnabled(value: boolean) {
+  try {
+    await submitRequestToBackground('setSolanaSupportEnabled', [value]);
+  } catch (error) {
+    logErrorWithMessage(error);
+  }
+}
+///: END:ONLY_INCLUDE_IF
+
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 export async function setAddSnapAccountEnabled(value: boolean): Promise<void> {
   try {

From 63ea629b7892a32f8d3d8b943927610e2270a7cb Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Mon, 4 Nov 2024 11:24:11 -0600
Subject: [PATCH 017/111] fix: Fix alignment of long RPC labels in Networks
 menu (#28244)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes alignment for long RPC labels in the networks list

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Add BNB Chain to MetaMask
2. Create a second RPC for it with the label `BNB Smart Chain
(previously Binance Smart Chain Mainnet)`
3. See the label left-aligned


## **Screenshots/Recordings**

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

### **Before**

![image
(2)](https://github.com/user-attachments/assets/eeb1a3e4-257b-42db-9130-abc79928553c)

### **After**

<img width="407" alt="SCR-20241104-iwaw"
src="https://github.com/user-attachments/assets/55435958-616e-4874-9a5c-9ef1f0554b3e">




## **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/components/multichain/network-list-item/index.scss         | 4 ++++
 .../multichain/network-list-item/network-list-item.tsx        | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ui/components/multichain/network-list-item/index.scss b/ui/components/multichain/network-list-item/index.scss
index 6597487c9cf6..cfbe80f2ce48 100644
--- a/ui/components/multichain/network-list-item/index.scss
+++ b/ui/components/multichain/network-list-item/index.scss
@@ -37,4 +37,8 @@
   &__delete {
     visibility: hidden;
   }
+
+  &__rpc-endpoint {
+    max-width: 100%;
+  }
 }
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 f80572eb1e4a..204ad7a5861f 100644
--- a/ui/components/multichain/network-list-item/network-list-item.tsx
+++ b/ui/components/multichain/network-list-item/network-list-item.tsx
@@ -190,6 +190,7 @@ export const NetworkListItem = ({
               as="button"
               variant={TextVariant.bodySmMedium}
               color={TextColor.textAlternative}
+              ellipsis
             >
               {rpcEndpoint.name ?? new URL(rpcEndpoint.url).host}
             </Text>

From 9d7798515fdafd0593a023aa64dbda4b2d33427a Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Mon, 4 Nov 2024 09:25:50 -0800
Subject: [PATCH 018/111] chore: use accounts api for token detection (#28254)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Enables the flag to use accounts api for token detection

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

## **Related issues**

## **Manual testing steps**

Onboard a new wallet and verify erc20 tokens are detected. In the
background worker, a network request should hit
accounts.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**

- [ ] 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/metamask-controller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a85233ca5119..ac72ba85dd84 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1782,6 +1782,8 @@ export default class MetamaskController extends EventEmitter {
       trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
         this.metaMetricsController,
       ),
+      useAccountsAPI: true,
+      platform: 'extension',
     });
 
     const addressBookControllerMessenger =

From 18e81ba8913831e2c3c10c2398f9ffcf6f26f40c Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Mon, 4 Nov 2024 17:29:49 +0000
Subject: [PATCH 019/111] fix: notification settings type (#28271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This fixes a poor type from converting a selectors file from JS to TS.
Instead of using a custom type for the accounts type, we can just use
inferred types.

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

## **Related issues**

Fixes:
https://github.com/MetaMask/metamask-extension/pull/27645#discussion_r1827945420

## **Manual testing steps**

N/A these are only type level 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] -->

## **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.
---
 .../notifications-settings.tsx                    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/ui/pages/notifications-settings/notifications-settings.tsx b/ui/pages/notifications-settings/notifications-settings.tsx
index 0fafb468b733..7606fed99614 100644
--- a/ui/pages/notifications-settings/notifications-settings.tsx
+++ b/ui/pages/notifications-settings/notifications-settings.tsx
@@ -1,7 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
-import type { InternalAccount } from '@metamask/keyring-api';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import { NOTIFICATIONS_ROUTE } from '../../helpers/constants/routes';
 import {
@@ -33,18 +32,6 @@ import { NotificationsSettingsAllowNotifications } from './notifications-setting
 import { NotificationsSettingsTypes } from './notifications-settings-types';
 import { NotificationsSettingsPerAccount } from './notifications-settings-per-account';
 
-// Define KeyringType interface
-type KeyringType = {
-  type: string;
-};
-
-// Define AccountType interface
-type AccountType = InternalAccount & {
-  balance: string;
-  keyring: KeyringType;
-  label: string;
-};
-
 export default function NotificationsSettings() {
   const history = useHistory();
   const location = useLocation();
@@ -57,7 +44,7 @@ export default function NotificationsSettings() {
   const isUpdatingMetamaskNotifications = useSelector(
     getIsUpdatingMetamaskNotifications,
   );
-  const accounts = useSelector(getInternalAccounts) as AccountType[];
+  const accounts = useSelector(getInternalAccounts);
 
   // States
   const [loadingAllowNotifications, setLoadingAllowNotifications] =

From aaee4e7ba905c2e8e8d383cdef22c12446ec7840 Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Mon, 4 Nov 2024 18:36:37 +0100
Subject: [PATCH 020/111] fix: ignore error when getTokenStandardAndDetails
 fails (#28030)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes Sentry issue when we are not able to determine token contract
standard.

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

## **Related issues**

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

## **Manual testing steps**

(I was not able to repro with my NFTs but to simulate, we can go to the
core fct `getTokenStandardAndDetails` and add
`throw new Error('Unable to determine contract standard');` at the start
of the fct;

1. Go NFT page
2. Click on any NFT
3. Click Send
4. You should be able to send the NFT

## **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/2ef39b0e-106a-48a2-a150-82176adaf14c

### **After**

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


https://github.com/user-attachments/assets/f0714310-410f-4f51-b7e2-6f0bc4011027




## **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: David Walsh <davidwalsh83@gmail.com>
---
 ui/ducks/send/send.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 512b621c38f4..30cbc6eeb5dd 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -2615,7 +2615,12 @@ export function updateSendAsset(
 
       let missingProperty = STANDARD_TO_REQUIRED_PROPERTIES[
         providedDetails.standard
-      ]?.find((property) => providedDetails[property] === undefined);
+      ]?.find((property) => {
+        if (providedDetails.collection && property === 'symbol') {
+          return providedDetails.collection[property] === undefined;
+        }
+        return providedDetails[property] === undefined;
+      });
 
       let details;
 
@@ -2652,10 +2657,9 @@ export function updateSendAsset(
             providedDetails.address,
             sendingAddress,
             providedDetails.tokenId,
-          ).catch((error) => {
+          ).catch(() => {
             // prevent infinite stuck loading state
             dispatch(hideLoadingIndication());
-            throw error;
           })),
         };
       }

From 9fb69f40168c78c8fa4205e8c3e68737af5916ac Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Tue, 5 Nov 2024 17:37:03 +0700
Subject: [PATCH 021/111] fix: Permit message, dataTree value incorrectly using
 default ERC20 decimals for non-ERC20 token values (#28142)
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 bug where fetchErc20Decimals was used in
`ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx`
info component and passed to the message dataTree to be used.
fetchErc20Decimals was incorrectly used as it cannot be assumed that the
token contract is an ERC20 standard. Fixed by calling
useGetTokenStandardAndDetails instead which will use the default 18
decimals digit if the standard is an ERC20 token with no decimals found
in the details.

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

## **Related issues**

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

## **Manual testing steps**

1. Go to test-dapp
2. Test Permit button
3. Observe both the simulation and message value display "3,000"
(contract is not an ERC20 standard so it does not apply default 18
decimals)

## **Screenshots/Recordings**

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

### **Before**

<img width="640"
src="https://private-user-images.githubusercontent.com/104780023/380556504-95ff2704-fca4-411e-b2b6-40dc6b099531.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzAxOTcyMjAsIm5iZiI6MTczMDE5NjkyMCwicGF0aCI6Ii8xMDQ3ODAwMjMvMzgwNTU2NTA0LTk1ZmYyNzA0LWZjYTQtNDExZS1iMmI2LTQwZGM2YjA5OTUzMS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQxMDI5JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MTAyOVQxMDE1MjBaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0wMDU4NjhhMGE0OGZhNjg4YzY0YmM3ZWRhNWFjYmUwNjFlZTY2ZDZjN2IyMDg1MjI0NGEyNTM2OTIyOGNmZjAzJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.MipJ95Oyanm_83vnd1FYq14ua0HgEiH_7GMt3hRDGLE">

### **After**

<img width="320"
src="https://github.com/user-attachments/assets/eea77452-3aa0-49b3-84a6-401ffb189b40">

## **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.
---
 .../confirm/info/typed-sign/typed-sign.tsx    | 20 ++++++-------------
 .../__snapshots__/confirm.test.tsx.snap       | 12 +++++------
 .../hooks/useGetTokenStandardAndDetails.ts    |  6 +++++-
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
index fa5e61caef1f..f14107c1fd8a 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { isValidAddress } from 'ethereumjs-util';
 
@@ -14,11 +14,11 @@ import {
 import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { SignatureRequestType } from '../../../../types/confirm';
+import { useGetTokenStandardAndDetails } from '../../../../hooks/useGetTokenStandardAndDetails';
 import {
   isOrderSignatureRequest,
   isPermitSignatureRequest,
 } from '../../../../utils';
-import { fetchErc20Decimals } from '../../../../utils/token';
 import { useConfirmContext } from '../../../../context/confirm';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
 import { ConfirmInfoRowTypedSignData } from '../../row/typed-sign-data/typedSignData';
@@ -31,7 +31,6 @@ const TypedSignInfo: React.FC = () => {
   const useTransactionSimulations = useSelector(
     selectUseTransactionSimulations,
   );
-  const [decimals, setDecimals] = useState<number>(0);
 
   if (!currentConfirmation?.msgParams) {
     return null;
@@ -44,17 +43,10 @@ const TypedSignInfo: React.FC = () => {
 
   const isPermit = isPermitSignatureRequest(currentConfirmation);
   const isOrder = isOrderSignatureRequest(currentConfirmation);
-  const chainId = currentConfirmation.chainId as string;
+  const tokenContract = isPermit || isOrder ? verifyingContract : undefined;
+  const { decimalsNumber } = useGetTokenStandardAndDetails(tokenContract);
 
-  useEffect(() => {
-    (async () => {
-      if (!isPermit && !isOrder) {
-        return;
-      }
-      const tokenDecimals = await fetchErc20Decimals(verifyingContract);
-      setDecimals(tokenDecimals);
-    })();
-  }, [verifyingContract]);
+  const chainId = currentConfirmation.chainId as string;
 
   const toolTipMessage = isSnapId(currentConfirmation.msgParams.origin)
     ? t('requestFromInfoSnap')
@@ -99,7 +91,7 @@ const TypedSignInfo: React.FC = () => {
         >
           <ConfirmInfoRowTypedSignData
             data={msgData}
-            tokenDecimals={decimals}
+            tokenDecimals={decimalsNumber}
             chainId={chainId}
           />
         </ConfirmInfoRow>
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index e1e7633ac055..acc76e3c1bb3 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -349,7 +349,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
           >
             <div>
               <div
-                aria-describedby="tippy-tooltip-17"
+                aria-describedby="tippy-tooltip-18"
                 class=""
                 data-original-title="Account details"
                 data-tooltipped=""
@@ -410,7 +410,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                   </p>
                   <div>
                     <div
-                      aria-describedby="tippy-tooltip-18"
+                      aria-describedby="tippy-tooltip-19"
                       class=""
                       data-original-title="Estimated changes are what might happen if you go through with this transaction. This is just a prediction, not a guarantee."
                       data-tooltipped=""
@@ -473,7 +473,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                           style="min-width: 0;"
                         >
                           <div
-                            aria-describedby="tippy-tooltip-22"
+                            aria-describedby="tippy-tooltip-25"
                             class=""
                             data-original-title="14,615,016,373,309,029,182,036,848,327,162,830,196,559,325,429.75"
                             data-tooltipped=""
@@ -525,7 +525,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                           style="min-width: 0;"
                         >
                           <div
-                            aria-describedby="tippy-tooltip-23"
+                            aria-describedby="tippy-tooltip-26"
                             class=""
                             data-original-title="24,615,016,373,309,029,182,036,848,327,162,830,196,559,325,429.75"
                             data-tooltipped=""
@@ -666,7 +666,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                   </p>
                   <div>
                     <div
-                      aria-describedby="tippy-tooltip-21"
+                      aria-describedby="tippy-tooltip-22"
                       class=""
                       data-original-title="This is the site asking for your signature."
                       data-tooltipped=""
@@ -1050,7 +1050,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                           style="min-width: 0;"
                         >
                           <div
-                            aria-describedby="tippy-tooltip-16"
+                            aria-describedby="tippy-tooltip-17"
                             class=""
                             data-original-title="14,615,016,373,309,029,182,036,848,327,162,830,196,559,325,429.75"
                             data-tooltipped=""
diff --git a/ui/pages/confirmations/hooks/useGetTokenStandardAndDetails.ts b/ui/pages/confirmations/hooks/useGetTokenStandardAndDetails.ts
index 88dfb0a12b9d..b4ad2b5d51ef 100644
--- a/ui/pages/confirmations/hooks/useGetTokenStandardAndDetails.ts
+++ b/ui/pages/confirmations/hooks/useGetTokenStandardAndDetails.ts
@@ -16,8 +16,12 @@ import {
  * @returns
  */
 export const useGetTokenStandardAndDetails = (
-  tokenAddress: Hex | string | undefined,
+  tokenAddress?: Hex | string | undefined,
 ) => {
+  if (!tokenAddress) {
+    return { decimalsNumber: undefined };
+  }
+
   const { value: details } = useAsyncResult<TokenDetailsERC20>(
     async () =>
       (await memoizedGetTokenStandardAndDetails(

From 7b8d2c6e35f75d98c427a1f1156d6ecf338619dd Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Tue, 5 Nov 2024 06:20:33 -0800
Subject: [PATCH 022/111] chore: display bridge quotes (#28031)
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:
   - display recommended quote in BridgeQuoteCard
   - add a placeholder modal for displaying alternative quotes

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

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1448

## **Manual testing steps**

1. Request bridge quotes
2. Click "Switch" button and verify that new quotes with updated params
are requested/shown
3. Verify that bridge parameters are reset when extension is reopened

## **Screenshots/Recordings**

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

### **Before**

N/A

### **After**



https://github.com/user-attachments/assets/acb927af-b04e-46cb-9b93-e2cdeb219722



## **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/_locales/en/messages.json                 |  28 ++
 test/jest/mock-store.js                       |   3 +
 ui/ducks/bridge/selectors.test.ts             |   2 +-
 ui/ducks/bridge/selectors.ts                  |  37 +-
 ui/hooks/bridge/useCountdownTimer.test.ts     |  34 ++
 ui/hooks/bridge/useCountdownTimer.ts          |  37 ++
 .../bridge/__snapshots__/index.test.tsx.snap  |   2 +-
 ui/pages/bridge/index.scss                    |   2 +
 .../prepare-bridge-page.test.tsx.snap         |   8 +-
 .../bridge/prepare/bridge-cta-button.test.tsx | 112 +++++-
 ui/pages/bridge/prepare/bridge-cta-button.tsx |  18 +-
 .../bridge/prepare/bridge-input-group.tsx     |  16 +-
 ui/pages/bridge/prepare/index.scss            |  52 +--
 .../prepare/prepare-bridge-page.test.tsx      |  11 +-
 .../bridge/prepare/prepare-bridge-page.tsx    |  15 +-
 .../bridge-quote-card.test.tsx.snap           | 357 ++++++++++++++++++
 .../bridge-quotes-modal.test.tsx.snap         | 139 +++++++
 .../bridge/quotes/bridge-quote-card.test.tsx  | 102 +++++
 ui/pages/bridge/quotes/bridge-quote-card.tsx  |  85 +++++
 .../quotes/bridge-quotes-modal.test.tsx       |  35 ++
 .../bridge/quotes/bridge-quotes-modal.tsx     |  65 ++++
 ui/pages/bridge/quotes/index.scss             |  83 ++++
 ui/pages/bridge/quotes/quote-info-row.tsx     |  51 +++
 ui/pages/bridge/utils/quote.ts                |  28 +-
 ui/pages/routes/utils.js                      |  11 +
 25 files changed, 1291 insertions(+), 42 deletions(-)
 create mode 100644 ui/hooks/bridge/useCountdownTimer.test.ts
 create mode 100644 ui/hooks/bridge/useCountdownTimer.ts
 create mode 100644 ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap
 create mode 100644 ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
 create mode 100644 ui/pages/bridge/quotes/bridge-quote-card.test.tsx
 create mode 100644 ui/pages/bridge/quotes/bridge-quote-card.tsx
 create mode 100644 ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
 create mode 100644 ui/pages/bridge/quotes/bridge-quotes-modal.tsx
 create mode 100644 ui/pages/bridge/quotes/index.scss
 create mode 100644 ui/pages/bridge/quotes/quote-info-row.tsx

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 08675837b34d..409965f07ab9 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -844,18 +844,40 @@
   "bridge": {
     "message": "Bridge"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Calculating..."
+  },
   "bridgeDontSend": {
     "message": "Bridge, don't send"
   },
+  "bridgeEnterAmount": {
+    "message": "Enter amount"
+  },
   "bridgeFrom": {
     "message": "Bridge from"
   },
+  "bridgeOverallCost": {
+    "message": "Overall cost"
+  },
   "bridgeSelectNetwork": {
     "message": "Select network"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Select token and amount"
+  },
+  "bridgeTimingMinutes": {
+    "message": "$1 minutes",
+    "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"
   },
+  "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."
+  },
   "browserNotSupported": {
     "message": "Your browser is not supported..."
   },
@@ -1965,6 +1987,9 @@
   "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."
   },
@@ -6110,6 +6135,9 @@
   "total": {
     "message": "Total"
   },
+  "totalFees": {
+    "message": "Total fees"
+  },
   "totalVolume": {
     "message": "Total volume"
   },
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 55ffa7f9ba1b..3fe524634075 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -3,6 +3,7 @@ import { CHAIN_IDS, CURRENCY_SYMBOLS } from '../../shared/constants/network';
 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';
 
 export const createGetSmartTransactionFeesApiResponse = () => {
   return {
@@ -726,6 +727,8 @@ export const createBridgeMockStore = (
           destNetworkAllowlist: [],
           ...featureFlagOverrides,
         },
+        quotes: DEFAULT_BRIDGE_CONTROLLER_STATE.quotes,
+        quoteRequest: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
         ...bridgeStateOverrides,
       },
     },
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index 6be67515e6e4..dbb49a20d66b 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -395,7 +395,7 @@ describe('Bridge selectors', () => {
       const state = createBridgeMockStore();
       const result = getToAmount(state as never);
 
-      expect(result).toStrictEqual('0');
+      expect(result).toStrictEqual(undefined);
     });
   });
 
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 568d62e7a2d4..a05640ded5c2 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -3,6 +3,7 @@ import {
   NetworkState,
 } from '@metamask/network-controller';
 import { uniqBy } from 'lodash';
+import { createSelector } from 'reselect';
 import {
   getNetworkConfigurationsByChainId,
   getIsBridgeEnabled,
@@ -19,6 +20,10 @@ import {
 import { createDeepEqualSelector } from '../../selectors/util';
 import { getProviderConfig } from '../metamask/metamask';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
+import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { RequestStatus } from '../../../app/scripts/controllers/bridge/constants';
 import { BridgeState } from './bridge';
 
 type BridgeAppState = {
@@ -124,10 +129,38 @@ export const getToToken = (
 
 export const getFromAmount = (state: BridgeAppState): string | null =>
   state.bridge.fromTokenInputValue;
-export const getToAmount = (_state: BridgeAppState) => {
-  return '0';
+
+export const getBridgeQuotes = (state: BridgeAppState) => {
+  return {
+    quotes: state.metamask.bridgeState.quotes,
+    quotesLastFetchedMs: state.metamask.bridgeState.quotesLastFetched,
+    isLoading:
+      state.metamask.bridgeState.quotesLoadingStatus === RequestStatus.LOADING,
+  };
 };
 
+export const getRecommendedQuote = createSelector(
+  getBridgeQuotes,
+  ({ quotes }) => {
+    // TODO implement sorting
+    return quotes[0];
+  },
+);
+
+export const getQuoteRequest = (state: BridgeAppState) => {
+  const { quoteRequest } = state.metamask.bridgeState;
+  return quoteRequest;
+};
+
+export const getToAmount = createSelector(getRecommendedQuote, (quote) =>
+  quote
+    ? calcTokenAmount(
+        quote.quote.destTokenAmount,
+        quote.quote.destAsset.decimals,
+      )
+    : undefined,
+);
+
 export const getIsBridgeTx = createDeepEqualSelector(
   getFromChain,
   getToChain,
diff --git a/ui/hooks/bridge/useCountdownTimer.test.ts b/ui/hooks/bridge/useCountdownTimer.test.ts
new file mode 100644
index 000000000000..14ac21d725fd
--- /dev/null
+++ b/ui/hooks/bridge/useCountdownTimer.test.ts
@@ -0,0 +1,34 @@
+import { renderHookWithProvider } from '../../../test/lib/render-helpers';
+import { createBridgeMockStore } from '../../../test/jest/mock-store';
+import { flushPromises } from '../../../test/lib/timer-helpers';
+import { useCountdownTimer } from './useCountdownTimer';
+
+jest.useFakeTimers();
+const renderUseCountdownTimer = (mockStoreState: object) =>
+  renderHookWithProvider(() => useCountdownTimer(), mockStoreState);
+
+describe('useCountdownTimer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.clearAllTimers();
+  });
+
+  it('returns time remaining', async () => {
+    const quotesLastFetched = Date.now();
+    const { result } = renderUseCountdownTimer(
+      createBridgeMockStore({}, {}, { quotesLastFetched }),
+    );
+
+    let i = 0;
+    while (i <= 30) {
+      const secondsLeft = Math.min(30, 30 - i + 1);
+      expect(result.current).toStrictEqual(
+        `0:${secondsLeft < 10 ? '0' : ''}${secondsLeft}`,
+      );
+      i += 10;
+      jest.advanceTimersByTime(10000);
+      await flushPromises();
+    }
+    expect(result.current).toStrictEqual('0:00');
+  });
+});
diff --git a/ui/hooks/bridge/useCountdownTimer.ts b/ui/hooks/bridge/useCountdownTimer.ts
new file mode 100644
index 000000000000..112d35b33f6a
--- /dev/null
+++ b/ui/hooks/bridge/useCountdownTimer.ts
@@ -0,0 +1,37 @@
+import { Duration } from 'luxon';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { getBridgeQuotes } from '../../ducks/bridge/selectors';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { REFRESH_INTERVAL_MS } from '../../../app/scripts/controllers/bridge/constants';
+import { SECOND } from '../../../shared/constants/time';
+
+/**
+ * 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.
+ */
+export const useCountdownTimer = () => {
+  const [timeRemaining, setTimeRemaining] = useState(REFRESH_INTERVAL_MS);
+  const { quotesLastFetchedMs } = useSelector(getBridgeQuotes);
+
+  useEffect(() => {
+    if (quotesLastFetchedMs) {
+      setTimeRemaining(
+        REFRESH_INTERVAL_MS - (Date.now() - quotesLastFetchedMs),
+      );
+    }
+  }, [quotesLastFetchedMs]);
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setTimeRemaining(Math.max(0, timeRemaining - SECOND));
+    }, SECOND);
+    return () => clearInterval(interval);
+  }, [timeRemaining]);
+
+  return Duration.fromMillis(timeRemaining).toFormat('m:ss');
+};
diff --git a/ui/pages/bridge/__snapshots__/index.test.tsx.snap b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
index cebca14e93bb..b9a6a4c83797 100644
--- a/ui/pages/bridge/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`Bridge renders the component with initial props 1`] = `
           data-theme="light"
           disabled=""
         >
-          Select token
+          Select token and amount
         </button>
       </div>
     </div>
diff --git a/ui/pages/bridge/index.scss b/ui/pages/bridge/index.scss
index 98a3a3ee5c34..bc96dfbbe825 100644
--- a/ui/pages/bridge/index.scss
+++ b/ui/pages/bridge/index.scss
@@ -1,6 +1,8 @@
 @use "design-system";
 
 @import 'prepare/index';
+@import 'quotes/index';
+
 
 .bridge {
   max-height: 100vh;
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 4284c1893d7c..26e25b8bd4cd 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
@@ -9,7 +9,7 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
       class="mm-box prepare-bridge-page__content"
     >
       <div
-        class="mm-box prepare-bridge-page__from"
+        class="mm-box bridge-box"
       >
         <div
           class="mm-box prepare-bridge-page__input-row"
@@ -130,7 +130,7 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
         </button>
       </div>
       <div
-        class="mm-box prepare-bridge-page__to"
+        class="mm-box bridge-box"
       >
         <div
           class="mm-box prepare-bridge-page__input-row"
@@ -213,7 +213,7 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
       class="mm-box prepare-bridge-page__content"
     >
       <div
-        class="mm-box prepare-bridge-page__from"
+        class="mm-box bridge-box"
       >
         <div
           class="mm-box prepare-bridge-page__input-row"
@@ -340,7 +340,7 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
         </button>
       </div>
       <div
-        class="mm-box prepare-bridge-page__to"
+        class="mm-box bridge-box"
       >
         <div
           class="mm-box prepare-bridge-page__input-row"
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index 5e42823c885b..91adb422e22b 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -3,6 +3,10 @@ import { renderWithProvider } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import { createBridgeMockStore } from '../../../../test/jest/mock-store';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
+import mockBridgeQuotesNativeErc20 from '../../../../test/data/bridge/mock-quotes-native-erc20.json';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants';
 import { BridgeCTAButton } from './bridge-cta-button';
 
 describe('BridgeCTAButton', () => {
@@ -25,6 +29,52 @@ describe('BridgeCTAButton', () => {
     expect(getByRole('button')).toBeDisabled();
   });
 
+  it('should render the component when amount is missing', () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+      },
+      {
+        fromTokenInputValue: null,
+        fromToken: 'ETH',
+        toToken: 'ETH',
+        toChainId: CHAIN_IDS.LINEA_MAINNET,
+      },
+      {},
+    );
+    const { getByText, getByRole } = renderWithProvider(
+      <BridgeCTAButton />,
+      configureStore(mockStore),
+    );
+
+    expect(getByText('Enter amount')).toBeInTheDocument();
+    expect(getByRole('button')).toBeDisabled();
+  });
+
+  it('should render the component when amount and dest token is missing', () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+      },
+      {
+        fromTokenInputValue: null,
+        fromToken: 'ETH',
+        toToken: null,
+        toChainId: CHAIN_IDS.LINEA_MAINNET,
+      },
+      {},
+    );
+    const { getByText, getByRole } = renderWithProvider(
+      <BridgeCTAButton />,
+      configureStore(mockStore),
+    );
+
+    expect(getByText('Select token and amount')).toBeInTheDocument();
+    expect(getByRole('button')).toBeDisabled();
+  });
+
   it('should render the component when tx is submittable', () => {
     const mockStore = createBridgeMockStore(
       {
@@ -37,14 +87,72 @@ describe('BridgeCTAButton', () => {
         toToken: 'ETH',
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {},
+      {
+        quotes: mockBridgeQuotesNativeErc20,
+        quotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.FETCHED,
+      },
+    );
+    const { getByText, getByRole } = renderWithProvider(
+      <BridgeCTAButton />,
+      configureStore(mockStore),
+    );
+
+    expect(getByText('Confirm')).toBeInTheDocument();
+    expect(getByRole('button')).not.toBeDisabled();
+  });
+
+  it('should disable the component when quotes are loading and there are no existing quotes', () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+      },
+      {
+        fromTokenInputValue: 1,
+        fromToken: 'ETH',
+        toToken: 'ETH',
+        toChainId: CHAIN_IDS.LINEA_MAINNET,
+      },
+      {
+        quotes: [],
+        quotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.LOADING,
+      },
+    );
+    const { getByText, getByRole } = renderWithProvider(
+      <BridgeCTAButton />,
+      configureStore(mockStore),
+    );
+
+    expect(getByText('Fetching quotes...')).toBeInTheDocument();
+    expect(getByRole('button')).toBeDisabled();
+  });
+
+  it('should enable the component when quotes are loading and there are existing quotes', () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+      },
+      {
+        fromTokenInputValue: 1,
+        fromToken: 'ETH',
+        toToken: 'ETH',
+        toChainId: CHAIN_IDS.LINEA_MAINNET,
+      },
+      {
+        quotes: mockBridgeQuotesNativeErc20,
+        quotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.LOADING,
+      },
     );
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
 
-    expect(getByText('Bridge')).toBeInTheDocument();
+    expect(getByText('Confirm')).toBeInTheDocument();
     expect(getByRole('button')).not.toBeDisabled();
   });
 });
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index fedcf4d4606a..28a1a2c1fbd6 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { Button } from '../../../components/component-library';
 import {
+  getBridgeQuotes,
   getFromAmount,
   getFromChain,
   getFromToken,
@@ -22,16 +23,29 @@ export const BridgeCTAButton = () => {
   const fromAmount = useSelector(getFromAmount);
   const toAmount = useSelector(getToAmount);
 
+  const { isLoading } = useSelector(getBridgeQuotes);
+
   const isTxSubmittable =
     fromToken && toToken && fromChain && toChain && fromAmount && toAmount;
 
   const label = useMemo(() => {
+    if (isLoading && !isTxSubmittable) {
+      return t('swapFetchingQuotes');
+    }
+
+    if (!fromAmount) {
+      if (!toToken) {
+        return t('bridgeSelectTokenAndAmount');
+      }
+      return t('bridgeEnterAmount');
+    }
+
     if (isTxSubmittable) {
-      return t('bridge');
+      return t('confirm');
     }
 
     return t('swapSelectToken');
-  }, [isTxSubmittable]);
+  }, [isLoading, fromAmount, toToken, isTxSubmittable]);
 
   return (
     <Button
diff --git a/ui/pages/bridge/prepare/bridge-input-group.tsx b/ui/pages/bridge/prepare/bridge-input-group.tsx
index 811310590c71..266af5b9a3cc 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Hex } from '@metamask/utils';
+import { useSelector } from 'react-redux';
 import { SwapsTokenObject } from '../../../../shared/constants/swaps';
 import {
   Box,
@@ -27,6 +28,10 @@ import {
   CHAIN_ID_TOKEN_IMAGE_MAP,
 } from '../../../../shared/constants/network';
 import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
+import {
+  getBridgeQuotes,
+  getRecommendedQuote,
+} from '../../../ducks/bridge/selectors';
 
 const generateAssetFromToken = (
   chainId: Hex,
@@ -69,7 +74,7 @@ export const BridgeInputGroup = ({
   token: SwapsTokenObject | SwapsEthToken | null;
   amountFieldProps?: Pick<
     React.ComponentProps<typeof TextField>,
-    'testId' | 'autoFocus' | 'value' | 'readOnly' | 'disabled'
+    'testId' | 'autoFocus' | 'value' | 'readOnly' | 'disabled' | 'className'
   >;
 } & Pick<
   React.ComponentProps<typeof AssetPicker>,
@@ -77,6 +82,9 @@ export const BridgeInputGroup = ({
 >) => {
   const t = useI18nContext();
 
+  const { isLoading } = useSelector(getBridgeQuotes);
+  const recommendedQuote = useSelector(getRecommendedQuote);
+
   const tokenFiatValue = useTokenFiatAmount(
     token?.address || undefined,
     amountFieldProps?.value?.toString() || '0x0',
@@ -125,7 +133,11 @@ export const BridgeInputGroup = ({
           <TextField
             type={TextFieldType.Number}
             className="amount-input"
-            placeholder="0"
+            placeholder={
+              isLoading && !recommendedQuote
+                ? t('bridgeCalculatingAmount')
+                : '0'
+            }
             onChange={(e) => {
               onAmountChange?.(e.target.value);
             }}
diff --git a/ui/pages/bridge/prepare/index.scss b/ui/pages/bridge/prepare/index.scss
index 1fa416df727f..9a523d8a7e91 100644
--- a/ui/pages/bridge/prepare/index.scss
+++ b/ui/pages/bridge/prepare/index.scss
@@ -11,6 +11,7 @@
   flex-flow: column;
   flex: 1;
   width: 100%;
+  gap: 24px;
 
   &__content {
     display: flex;
@@ -20,8 +21,7 @@
     border: 1px solid var(--color-border-muted);
   }
 
-  &__from,
-  &__to {
+  .bridge-box {
     display: flex;
     flex-direction: column;
     gap: 4px;
@@ -55,6 +55,34 @@
         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--focused {
+      outline: none;
+    }
   }
 
   &__amounts-row {
@@ -96,26 +124,6 @@
     }
   }
 
-  .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--focused {
-      outline: none;
-    }
-  }
-
   &__switch-tokens {
     display: flex;
     justify-content: center;
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 82441aad218d..1ae0b59f3757 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -66,7 +66,16 @@ describe('PrepareBridgePage', () => {
         },
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {},
+      {
+        quoteRequest: {
+          srcTokenAddress: '0x3103910',
+          destTokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          srcChainId: 1,
+          destChainId: 10,
+          walletAddress: '0x123',
+          slippage: 0.5,
+        },
+      },
     );
     const { container, getByRole, getByTestId } = renderWithProvider(
       <PrepareBridgePage />,
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index b0907f83dab7..f71dc0813d33 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -18,6 +18,7 @@ import {
   getFromToken,
   getFromTokens,
   getFromTopAssets,
+  getQuoteRequest,
   getToAmount,
   getToChain,
   getToChains,
@@ -38,6 +39,8 @@ 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 { BridgeInputGroup } from './bridge-input-group';
 
 const PrepareBridgePage = () => {
@@ -61,6 +64,8 @@ const PrepareBridgePage = () => {
   const fromAmount = useSelector(getFromAmount);
   const toAmount = useSelector(getToAmount);
 
+  const quoteRequest = useSelector(getQuoteRequest);
+
   const fromTokenListGenerator = useTokensWithFiltering(
     fromTokens,
     fromTopAssets,
@@ -110,7 +115,7 @@ const PrepareBridgePage = () => {
     <div className="prepare-bridge-page">
       <Box className="prepare-bridge-page__content">
         <BridgeInputGroup
-          className="prepare-bridge-page__from"
+          className="bridge-box"
           header={t('bridgeFrom')}
           token={fromToken}
           onAmountChange={(e) => {
@@ -157,7 +162,7 @@ const PrepareBridgePage = () => {
             data-testid="switch-tokens"
             ariaLabel="switch-tokens"
             iconName={IconName.Arrow2Down}
-            disabled={!toChain}
+            disabled={!isValidQuoteRequest(quoteRequest, false)}
             onClick={() => {
               setRotateSwitchTokens(!rotateSwitchTokens);
               const toChainClientId =
@@ -178,7 +183,7 @@ const PrepareBridgePage = () => {
         </Box>
 
         <BridgeInputGroup
-          className="prepare-bridge-page__to"
+          className="bridge-box"
           header={t('bridgeTo')}
           token={toToken}
           onAssetChange={(token) => dispatch(setToToken(token))}
@@ -199,10 +204,12 @@ const PrepareBridgePage = () => {
             testId: 'to-amount',
             readOnly: true,
             disabled: true,
-            value: toAmount,
+            value: toAmount?.toString() ?? '0',
+            className: toAmount ? 'amount-input defined' : 'amount-input',
           }}
         />
       </Box>
+      <BridgeQuoteCard />
     </div>
   );
 };
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
new file mode 100644
index 000000000000..cb7b5afb4c77
--- /dev/null
+++ b/ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap
@@ -0,0 +1,357 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BridgeQuoteCard should not render when there is a quote fetch error 1`] = `<div />`;
+
+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"
+  >
+    <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"
+    >
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <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>
+        <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"
+            />
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            1 minutes
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Quote rate
+          </p>
+        </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"
+            />
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            1 USDC = 0.9989 USDC
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Total fees
+          </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"
+            >
+              0.01 ETH
+            </p>
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            $0.01
+          </p>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box bridge-box quote-card__footer"
+    >
+      <span>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+        >
+          Includes a 0.875% MetaMask fee.
+        </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"
+        >
+          <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"
+      >
+        <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"
+          >
+            Terms of service
+          </p>
+        </span>
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`BridgeQuoteCard should render the recommended quote while loading new quotes 1`] = `
+<div>
+  <div
+    class="mm-box quote-card"
+  >
+    <div
+      class="mm-box bridge-box quote-card__timer"
+    />
+    <div
+      class="mm-box bridge-box prepare-bridge-page__content quote-card__content"
+    >
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <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>
+        <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"
+            />
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            1 minutes
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Quote rate
+          </p>
+        </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"
+            />
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            1 ETH = 2465.4630 USDC
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box quote-card__info-row"
+      >
+        <div
+          class="mm-box quote-card__info-row__label"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            Total fees
+          </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"
+            >
+              0.01 ETH
+            </p>
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          >
+            $0.01
+          </p>
+        </div>
+      </div>
+    </div>
+    <div
+      class="mm-box bridge-box quote-card__footer"
+    >
+      <span>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+        >
+          Includes a 0.875% MetaMask fee.
+        </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"
+        >
+          <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"
+      >
+        <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"
+          >
+            Terms of service
+          </p>
+        </span>
+      </button>
+    </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
new file mode 100644
index 000000000000..41d8a03d1ac1
--- /dev/null
+++ b/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
@@ -0,0 +1,139 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BridgeQuotesModal should render the modal 1`] = `
+<body>
+  <div
+    id="popover-content"
+  />
+  <div />
+  <div
+    class="mm-modal quotes-modal"
+  >
+    <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-0 mm-box--padding-top-4 mm-box--padding-bottom-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--background-color-background-default mm-box--rounded-lg"
+          role="dialog"
+        >
+          <header
+            class="mm-box mm-header-base mm-modal-header mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--justify-content-space-between"
+          >
+            <div
+              class="mm-box mm-box--width-full"
+            >
+              <h4
+                class="mm-box mm-text mm-text--heading-sm mm-text--text-align-center mm-box--color-text-default"
+              >
+                Select a quote
+              </h4>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex mm-box--justify-content-flex-end"
+              style="min-width: 0px;"
+            >
+              <button
+                aria-label="Close"
+                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-default mm-box--background-color-transparent mm-box--rounded-lg"
+              >
+                <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/close.svg');"
+                />
+              </button>
+            </div>
+          </header>
+          <div
+            class="mm-box quotes-modal__column-header"
+          >
+            <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"
+            >
+              <span
+                class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
+              >
+                <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');"
+                />
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+                >
+                  Overall cost
+                </p>
+              </span>
+            </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-primary-default mm-box--background-color-transparent"
+            >
+              <span
+                class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
+              >
+                <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');"
+                />
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+                >
+                  Time
+                </p>
+              </span>
+            </button>
+          </div>
+          <div
+            class="mm-box quotes-modal__quotes"
+          >
+            <div
+              class="mm-box quotes-modal__quotes__row"
+            >
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              >
+                $0.01
+              </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              >
+                1 minutes
+              </p>
+            </div>
+            <div
+              class="mm-box quotes-modal__quotes__row"
+            >
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              >
+                $0.01
+              </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              >
+                26 minutes
+              </p>
+            </div>
+          </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/pages/bridge/quotes/bridge-quote-card.test.tsx b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
new file mode 100644
index 000000000000..b9bfc69e8e5a
--- /dev/null
+++ b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import { createBridgeMockStore } from '../../../../test/jest/mock-store';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes-erc20-erc20.json';
+import mockBridgeQuotesNativeErc20 from '../../../../test/data/bridge/mock-quotes-native-erc20.json';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants';
+import { BridgeQuoteCard } from './bridge-quote-card';
+
+describe('BridgeQuoteCard', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the recommended quote', async () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+      },
+      { fromTokenInputValue: 1 },
+      {
+        quotes: mockBridgeQuotesErc20Erc20,
+        getQuotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.FETCHED,
+      },
+    );
+    const { container } = renderWithProvider(
+      <BridgeQuoteCard />,
+      configureStore(mockStore),
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render the recommended quote while loading new quotes', async () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+      },
+      { fromTokenInputValue: 1 },
+      {
+        quotes: mockBridgeQuotesNativeErc20,
+        getQuotesLastFetched: Date.now() - 5000,
+        quotesLoadingStatus: RequestStatus.LOADING,
+      },
+    );
+    const { container, queryByText } = renderWithProvider(
+      <BridgeQuoteCard />,
+      configureStore(mockStore),
+    );
+
+    expect(container).toMatchSnapshot();
+    expect(queryByText('New quotes in')).not.toBeInTheDocument();
+  });
+
+  it('should not render when there is no quote', async () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+      },
+      { fromTokenInputValue: 1 },
+      {
+        quotes: [],
+        getQuotesLastFetched: Date.now() - 5000,
+        quotesLoadingStatus: RequestStatus.FETCHED,
+      },
+    );
+    const { container } = renderWithProvider(
+      <BridgeQuoteCard />,
+      configureStore(mockStore),
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should not render when there is a quote fetch error', async () => {
+    const mockStore = createBridgeMockStore(
+      {
+        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
+        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+      },
+      { fromTokenInputValue: 1 },
+      {
+        quotes: [],
+        getQuotesLastFetched: Date.now() - 5000,
+        quotesLoadingStatus: RequestStatus.ERROR,
+      },
+    );
+    const { container } = renderWithProvider(
+      <BridgeQuoteCard />,
+      configureStore(mockStore),
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.tsx b/ui/pages/bridge/quotes/bridge-quote-card.tsx
new file mode 100644
index 000000000000..2928565809af
--- /dev/null
+++ b/ui/pages/bridge/quotes/bridge-quote-card.tsx
@@ -0,0 +1,85 @@
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  Box,
+  Button,
+  ButtonVariant,
+  Text,
+} from '../../../components/component-library';
+import {
+  getBridgeQuotes,
+  getRecommendedQuote,
+} from '../../../ducks/bridge/selectors';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getQuoteDisplayData } from '../utils/quote';
+import { useCountdownTimer } from '../../../hooks/bridge/useCountdownTimer';
+import MascotBackgroundAnimation from '../../swaps/mascot-background-animation/mascot-background-animation';
+import { QuoteInfoRow } from './quote-info-row';
+import { BridgeQuotesModal } from './bridge-quotes-modal';
+
+export const BridgeQuoteCard = () => {
+  const t = useI18nContext();
+  const recommendedQuote = useSelector(getRecommendedQuote);
+  const { isLoading } = useSelector(getBridgeQuotes);
+
+  const { etaInMinutes, totalFees, quoteRate } =
+    getQuoteDisplayData(recommendedQuote);
+
+  const secondsUntilNextRefresh = useCountdownTimer();
+
+  const [showAllQuotes, setShowAllQuotes] = useState(false);
+
+  if (isLoading && !recommendedQuote) {
+    return (
+      <Box>
+        <MascotBackgroundAnimation />
+      </Box>
+    );
+  }
+
+  return etaInMinutes && totalFees && quoteRate ? (
+    <Box className="quote-card">
+      <BridgeQuotesModal
+        isOpen={showAllQuotes}
+        onClose={() => setShowAllQuotes(false)}
+      />
+      <Box className="bridge-box quote-card__timer">
+        {!isLoading && (
+          <Text>{t('swapNewQuoteIn', [secondsUntilNextRefresh])}</Text>
+        )}
+      </Box>
+
+      <Box className="bridge-box prepare-bridge-page__content quote-card__content">
+        <QuoteInfoRow
+          label={t('estimatedTime')}
+          tooltipText={t('bridgeTimingTooltipText')}
+          description={t('bridgeTimingMinutes', [etaInMinutes])}
+        />
+        <QuoteInfoRow label={t('quoteRate')} description={quoteRate} />
+        <QuoteInfoRow
+          label={t('totalFees')}
+          tooltipText={t('bridgeTotalFeesTooltipText')}
+          description={totalFees.fiat}
+          secondaryDescription={totalFees?.amount}
+        />
+      </Box>
+
+      <Box className="bridge-box quote-card__footer">
+        <span>
+          <Text>{t('swapIncludesMMFee', [0.875])}</Text>
+          <Button
+            variant={ButtonVariant.Link}
+            onClick={() => {
+              setShowAllQuotes(true);
+            }}
+          >
+            <Text>{t('viewAllQuotes')}</Text>
+          </Button>
+        </span>
+        <Button variant={ButtonVariant.Link}>
+          <Text>{t('termsOfService')}</Text>
+        </Button>
+      </Box>
+    </Box>
+  ) : null;
+};
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
new file mode 100644
index 000000000000..0431f1b8eada
--- /dev/null
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants';
+import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes-erc20-erc20.json';
+import { createBridgeMockStore } from '../../../../test/jest/mock-store';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import configureStore from '../../../store/store';
+import { BridgeQuotesModal } from './bridge-quotes-modal';
+
+describe('BridgeQuotesModal', () => {
+  it('should render the modal', () => {
+    const mockStore = createBridgeMockStore(
+      {},
+      {},
+      {
+        quotes: mockBridgeQuotesErc20Erc20,
+        getQuotesLastFetched: Date.now(),
+        quotesLoadingStatus: RequestStatus.FETCHED,
+      },
+    );
+
+    const { baseElement } = renderWithProvider(
+      <BridgeQuotesModal
+        isOpen={true}
+        onClose={() => {
+          console.log('close');
+        }}
+      />,
+      configureStore(mockStore),
+    );
+
+    expect(baseElement).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
new file mode 100644
index 000000000000..7e78e515af6e
--- /dev/null
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { IconName } from '@metamask/snaps-sdk/jsx';
+import {
+  Box,
+  Button,
+  ButtonVariant,
+  Icon,
+  IconSize,
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  Text,
+} from '../../../components/component-library';
+import {
+  TextAlign,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
+import { getQuoteDisplayData } from '../utils/quote';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export const BridgeQuotesModal = ({
+  onClose,
+  ...modalProps
+}: Omit<React.ComponentProps<typeof Modal>, 'children'>) => {
+  const { quotes } = useSelector(getBridgeQuotes);
+  const t = useI18nContext();
+
+  return (
+    <Modal className="quotes-modal" onClose={onClose} {...modalProps}>
+      <ModalOverlay />
+      <ModalContent modalDialogProps={{ padding: 0 }}>
+        <ModalHeader onClose={onClose}>
+          <Text variant={TextVariant.headingSm} textAlign={TextAlign.Center}>
+            {t('swapSelectAQuote')}
+          </Text>
+        </ModalHeader>
+
+        <Box className="quotes-modal__column-header">
+          {[t('bridgeOverallCost'), t('time')].map((label) => {
+            return (
+              <Button key={label} variant={ButtonVariant.Link}>
+                <Icon name={IconName.Arrow2Down} size={IconSize.Sm} />
+                <Text>{label}</Text>
+              </Button>
+            );
+          })}
+        </Box>
+        <Box className="quotes-modal__quotes">
+          {quotes.map((quote, index) => {
+            const { totalFees, etaInMinutes } = getQuoteDisplayData(quote);
+            return (
+              <Box key={index} className="quotes-modal__quotes__row">
+                <Text>{totalFees?.fiat}</Text>
+                <Text>{t('bridgeTimingMinutes', [etaInMinutes])}</Text>
+              </Box>
+            );
+          })}
+        </Box>
+      </ModalContent>
+    </Modal>
+  );
+};
diff --git a/ui/pages/bridge/quotes/index.scss b/ui/pages/bridge/quotes/index.scss
new file mode 100644
index 000000000000..6d52c9e1e753
--- /dev/null
+++ b/ui/pages/bridge/quotes/index.scss
@@ -0,0 +1,83 @@
+@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 {
+  &__column-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+
+  &__quotes {
+    display: flex;
+    flex-direction: column;
+
+    &__row {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+    }
+  }
+}
diff --git a/ui/pages/bridge/quotes/quote-info-row.tsx b/ui/pages/bridge/quotes/quote-info-row.tsx
new file mode 100644
index 000000000000..d1cccc62ed8e
--- /dev/null
+++ b/ui/pages/bridge/quotes/quote-info-row.tsx
@@ -0,0 +1,51 @@
+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/utils/quote.ts b/ui/pages/bridge/utils/quote.ts
index 0b83205580b4..b5945f64a9df 100644
--- a/ui/pages/bridge/utils/quote.ts
+++ b/ui/pages/bridge/utils/quote.ts
@@ -1,4 +1,5 @@
-import { QuoteRequest } from '../types';
+import { calcTokenAmount } from '../../../../shared/lib/transactions-controller-utils';
+import { QuoteResponse, QuoteRequest } from '../types';
 
 export const isValidQuoteRequest = (
   partialRequest: Partial<QuoteRequest>,
@@ -31,3 +32,28 @@ export const isValidQuoteRequest = (
     )
   );
 };
+
+export const getQuoteDisplayData = (quoteResponse?: QuoteResponse) => {
+  const { quote, estimatedProcessingTimeInSeconds } = quoteResponse ?? {};
+  if (!quoteResponse || !quote || !estimatedProcessingTimeInSeconds) {
+    return {};
+  }
+
+  const etaInMinutes = (estimatedProcessingTimeInSeconds / 60).toFixed();
+  const quoteRate = `1 ${quote.srcAsset.symbol} = ${calcTokenAmount(
+    quote.destTokenAmount,
+    quote.destAsset.decimals,
+  )
+    .div(calcTokenAmount(quote.srcTokenAmount, quote.srcAsset.decimals))
+    .toFixed(4)
+    .toString()} ${quote.destAsset.symbol}`;
+
+  return {
+    etaInMinutes,
+    totalFees: {
+      amount: '0.01 ETH', // TODO implement gas + relayer fee
+      fiat: '$0.01',
+    },
+    quoteRate,
+  };
+};
diff --git a/ui/pages/routes/utils.js b/ui/pages/routes/utils.js
index 31918f91bb07..a887160387e1 100644
--- a/ui/pages/routes/utils.js
+++ b/ui/pages/routes/utils.js
@@ -12,6 +12,7 @@ import {
   CONFIRMATION_V_NEXT_ROUTE,
   CONNECT_ROUTE,
   CONNECTIONS,
+  CROSS_CHAIN_SWAP_ROUTE,
   NOTIFICATIONS_ROUTE,
   ONBOARDING_ROUTE,
   ONBOARDING_UNLOCK_ROUTE,
@@ -196,6 +197,16 @@ export function hideAppHeader(props) {
     return true;
   }
 
+  const isCrossChainSwapsPage = Boolean(
+    matchPath(location.pathname, {
+      path: `${CROSS_CHAIN_SWAP_ROUTE}`,
+      exact: false,
+    }),
+  );
+  if (isCrossChainSwapsPage) {
+    return true;
+  }
+
   const isHandlingAddEthereumChainRequest = Boolean(
     matchPath(location.pathname, {
       path: CONFIRMATION_V_NEXT_ROUTE,

From 56e92f87a310cfb5729072195c72280c7dcc876a Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 5 Nov 2024 14:35:04 +0000
Subject: [PATCH 023/111] fix: Hide fiat values on test networks (#28219)
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**

Hides fiat values by default unless "Show conversion on test networks"
is toggled on in the settings. Includes changes to the gas fees
components, and the send heading components for native and erc20 tokens.

<!--
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/28219?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Toggle off "Show conversion on test networks" in the settings
2. Initiate a SepoliaETH or any erc20 token transfer from the wallet on
Sepolia network
3. Check the gas fees components and the heading component.

## **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/contract-deployment.test.tsx |  4 ---
 .../contract-interaction.test.tsx             |  4 ---
 .../native-transfer.test.tsx.snap             |  5 ---
 .../edit-gas-fees-row/edit-gas-fees-row.tsx   | 31 +++++++++++++------
 .../gas-fees-row/gas-fees-row.stories.tsx     | 15 +++++----
 .../shared/gas-fees-row/gas-fees-row.test.tsx |  4 +--
 .../info/shared/gas-fees-row/gas-fees-row.tsx | 18 ++++++++++-
 .../native-send-heading.tsx                   | 23 ++++++++++----
 .../info/shared/send-heading/send-heading.tsx | 19 +++++++++---
 9 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/test/integration/confirmations/transactions/contract-deployment.test.tsx b/test/integration/confirmations/transactions/contract-deployment.test.tsx
index c2625e06e3e7..67862e6b9550 100644
--- a/test/integration/confirmations/transactions/contract-deployment.test.tsx
+++ b/test/integration/confirmations/transactions/contract-deployment.test.tsx
@@ -284,9 +284,6 @@ describe('Contract Deployment Confirmation', () => {
 
     const firstGasField = within(editGasFeesRow).getByTestId('first-gas-field');
     expect(firstGasField).toHaveTextContent('0.0001 SepoliaETH');
-    const editGasFeeNativeCurrency =
-      within(editGasFeesRow).getByTestId('native-currency');
-    expect(editGasFeeNativeCurrency).toHaveTextContent('$0.47');
     expect(editGasFeesRow).toContainElement(
       screen.getByTestId('edit-gas-fee-icon'),
     );
@@ -372,7 +369,6 @@ describe('Contract Deployment Confirmation', () => {
     expect(gasFeesSection).toContainElement(maxFee);
     expect(maxFee).toHaveTextContent(tEn('maxFee') as string);
     expect(maxFee).toHaveTextContent('0.0023 SepoliaETH');
-    expect(maxFee).toHaveTextContent('$7.72');
 
     const nonceSection = screen.getByTestId('advanced-details-nonce-section');
     expect(nonceSection).toBeInTheDocument();
diff --git a/test/integration/confirmations/transactions/contract-interaction.test.tsx b/test/integration/confirmations/transactions/contract-interaction.test.tsx
index b77e48f1d660..9a955e1a45fb 100644
--- a/test/integration/confirmations/transactions/contract-interaction.test.tsx
+++ b/test/integration/confirmations/transactions/contract-interaction.test.tsx
@@ -302,9 +302,6 @@ describe('Contract Interaction Confirmation', () => {
 
     const firstGasField = within(editGasFeesRow).getByTestId('first-gas-field');
     expect(firstGasField).toHaveTextContent('0.0001 SepoliaETH');
-    const editGasFeeNativeCurrency =
-      within(editGasFeesRow).getByTestId('native-currency');
-    expect(editGasFeeNativeCurrency).toHaveTextContent('$0.47');
     expect(editGasFeesRow).toContainElement(
       screen.getByTestId('edit-gas-fee-icon'),
     );
@@ -403,7 +400,6 @@ describe('Contract Interaction Confirmation', () => {
     expect(gasFeesSection).toContainElement(maxFee);
     expect(maxFee).toHaveTextContent(tEn('maxFee') as string);
     expect(maxFee).toHaveTextContent('0.0023 SepoliaETH');
-    expect(maxFee).toHaveTextContent('$7.72');
 
     const nonceSection = screen.getByTestId('advanced-details-nonce-section');
     expect(nonceSection).toBeInTheDocument();
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 234c0b704d5c..843002b76884 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
@@ -15,11 +15,6 @@ exports[`NativeTransferInfo renders correctly 1`] = `
     >
       0 ETH
     </h2>
-    <p
-      class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
-    >
-      0
-    </p>
   </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/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 7d4223f01204..0462f8189e53 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
@@ -1,5 +1,9 @@
-import React, { Dispatch, SetStateAction } from 'react';
 import { TransactionMeta } from '@metamask/transaction-controller';
+import React, { Dispatch, SetStateAction } from 'react';
+import { useSelector } from 'react-redux';
+import { TEST_CHAINS } from '../../../../../../../../shared/constants/network';
+import { ConfirmInfoAlertRow } from '../../../../../../../components/app/confirm/info/row/alert-row/alert-row';
+import { RowAlertKey } from '../../../../../../../components/app/confirm/info/row/constants';
 import { Box, Text } from '../../../../../../../components/component-library';
 import {
   AlignItems,
@@ -10,10 +14,9 @@ import {
   TextColor,
 } from '../../../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
+import { getPreferences } from '../../../../../../../selectors';
 import { useConfirmContext } from '../../../../../context/confirm';
 import { EditGasIconButton } from '../edit-gas-icon/edit-gas-icon-button';
-import { ConfirmInfoAlertRow } from '../../../../../../../components/app/confirm/info/row/alert-row/alert-row';
-import { RowAlertKey } from '../../../../../../../components/app/confirm/info/row/constants';
 
 export const EditGasFeesRow = ({
   fiatFee,
@@ -31,6 +34,12 @@ export const EditGasFeesRow = ({
   const { currentConfirmation: transactionMeta } =
     useConfirmContext<TransactionMeta>();
 
+  type TestNetChainId = (typeof TEST_CHAINS)[number];
+  const isTestnet = TEST_CHAINS.includes(
+    transactionMeta.chainId as TestNetChainId,
+  );
+  const { showFiatInTestnets } = useSelector(getPreferences);
+
   return (
     <ConfirmInfoAlertRow
       alertKey={RowAlertKey.EstimatedFee}
@@ -53,13 +62,15 @@ export const EditGasFeesRow = ({
         >
           {nativeFee}
         </Text>
-        <Text
-          marginRight={2}
-          color={TextColor.textAlternative}
-          data-testid="native-currency"
-        >
-          {fiatFee}
-        </Text>
+        {(!isTestnet || showFiatInTestnets) && (
+          <Text
+            marginRight={2}
+            color={TextColor.textAlternative}
+            data-testid="native-currency"
+          >
+            {fiatFee}
+          </Text>
+        )}
         <EditGasIconButton
           supportsEIP1559={supportsEIP1559}
           setShowCustomizeGasPopover={setShowCustomizeGasPopover}
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.stories.tsx b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.stories.tsx
index a70d0057ec82..89f2a8308bd5 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.stories.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.stories.tsx
@@ -4,6 +4,7 @@ import { Provider } from 'react-redux';
 
 import mockState from '../../../../../../../../test/data/mock-state.json';
 import configureStore from '../../../../../../../store/store';
+import { ConfirmContextProvider } from '../../../../../context/confirm';
 import { GasFeesRow } from './gas-fees-row';
 
 function getStore() {
@@ -32,12 +33,14 @@ const Story = {
 export default Story;
 
 export const DefaultStory = () => (
-  <GasFeesRow
-    label="Some kind of fee"
-    tooltipText="Tooltip text"
-    fiatFee="$1"
-    nativeFee="0.0001 ETH"
-  />
+  <ConfirmContextProvider>
+    <GasFeesRow
+      label="Some kind of fee"
+      tooltipText="Tooltip text"
+      fiatFee="$1"
+      nativeFee="0.0001 ETH"
+    />
+  </ConfirmContextProvider>
 );
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.test.tsx b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.test.tsx
index 12b857acc1b2..e5433c38fa5d 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.test.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import { renderWithProvider } from '../../../../../../../../test/lib/render-helpers';
 import mockState from '../../../../../../../../test/data/mock-state.json';
+import { renderWithConfirmContextProvider } from '../../../../../../../../test/lib/confirmations/render-helpers';
 import { GasFeesRow } from './gas-fees-row';
 
 describe('<GasFeesRow />', () => {
@@ -12,7 +12,7 @@ describe('<GasFeesRow />', () => {
   it('renders component', () => {
     const state = mockState;
     const mockStore = configureMockStore(middleware)(state);
-    const { container } = renderWithProvider(
+    const { container } = renderWithConfirmContextProvider(
       <GasFeesRow
         label="Some kind of fee"
         tooltipText="Tooltip text"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx
index 152b3cb7b606..82c36147ad1d 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx
@@ -1,4 +1,7 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
+import { useSelector } from 'react-redux';
+import { TEST_CHAINS } from '../../../../../../../../shared/constants/network';
 import {
   ConfirmInfoRow,
   ConfirmInfoRowVariant,
@@ -12,6 +15,8 @@ import {
   TextAlign,
   TextColor,
 } from '../../../../../../../helpers/constants/design-system';
+import { getPreferences } from '../../../../../../../selectors';
+import { useConfirmContext } from '../../../../../context/confirm';
 
 export const GasFeesRow = ({
   label,
@@ -26,6 +31,15 @@ export const GasFeesRow = ({
   nativeFee: string;
   'data-testid'?: string;
 }) => {
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
+
+  type TestNetChainId = (typeof TEST_CHAINS)[number];
+  const isTestnet = TEST_CHAINS.includes(
+    transactionMeta?.chainId as TestNetChainId,
+  );
+  const { showFiatInTestnets } = useSelector(getPreferences);
+
   return (
     <ConfirmInfoRow
       data-testid={dataTestId}
@@ -44,7 +58,9 @@ export const GasFeesRow = ({
         <Text marginRight={1} color={TextColor.textDefault}>
           {nativeFee}
         </Text>
-        <Text color={TextColor.textAlternative}>{fiatFee}</Text>
+        {(!isTestnet || showFiatInTestnets) && (
+          <Text color={TextColor.textAlternative}>{fiatFee}</Text>
+        )}
       </Box>
     </ConfirmInfoRow>
   );
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 a3c2b91c9f8e..bd5c7ba8b4f2 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
@@ -2,7 +2,10 @@ import { TransactionMeta } from '@metamask/transaction-controller';
 import { BigNumber } from 'bignumber.js';
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../../../../shared/constants/network';
+import {
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  TEST_CHAINS,
+} from '../../../../../../../../shared/constants/network';
 import {
   AvatarToken,
   AvatarTokenSize,
@@ -22,6 +25,7 @@ import {
 } from '../../../../../../../helpers/constants/design-system';
 import { MIN_AMOUNT } from '../../../../../../../hooks/useCurrencyDisplay';
 import { useFiatFormatter } from '../../../../../../../hooks/useFiatFormatter';
+import { getPreferences } from '../../../../../../../selectors';
 import { getMultichainNetwork } from '../../../../../../../selectors/multichain';
 import { useConfirmContext } from '../../../../../context/confirm';
 import {
@@ -59,6 +63,12 @@ const NativeSendHeading = () => {
     nativeAssetTransferValue.toNumber(),
   );
 
+  type TestNetChainId = (typeof TEST_CHAINS)[number];
+  const isTestnet = TEST_CHAINS.includes(
+    transactionMeta.chainId as TestNetChainId,
+  );
+  const { showFiatInTestnets } = useSelector(getPreferences);
+
   const NetworkImage = (
     <AvatarToken
       src={
@@ -94,11 +104,12 @@ const NativeSendHeading = () => {
       </Text>
     );
 
-  const NativeAssetFiatConversion = (
-    <Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
-      {fiatDisplayValue}
-    </Text>
-  );
+  const NativeAssetFiatConversion = Boolean(fiatDisplayValue) &&
+    (!isTestnet || showFiatInTestnets) && (
+      <Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
+        {fiatDisplayValue}
+      </Text>
+    );
 
   return (
     <Box
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 3f6bd429d20b..b44f5be93a4f 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
@@ -1,6 +1,7 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { TEST_CHAINS } from '../../../../../../../../shared/constants/network';
 import {
   AvatarToken,
   AvatarTokenSize,
@@ -20,6 +21,7 @@ import {
 } from '../../../../../../../helpers/constants/design-system';
 import { MIN_AMOUNT } from '../../../../../../../hooks/useCurrencyDisplay';
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
+import { getPreferences } from '../../../../../../../selectors';
 import { useConfirmContext } from '../../../../../context/confirm';
 import { formatAmountMaxPrecision } from '../../../../simulation-details/formatAmount';
 import { useTokenValues } from '../../hooks/use-token-values';
@@ -39,6 +41,12 @@ const SendHeading = () => {
     pending,
   } = useTokenValues(transactionMeta);
 
+  type TestNetChainId = (typeof TEST_CHAINS)[number];
+  const isTestnet = TEST_CHAINS.includes(
+    transactionMeta.chainId as TestNetChainId,
+  );
+  const { showFiatInTestnets } = useSelector(getPreferences);
+
   const TokenImage = (
     <AvatarToken
       src={tokenImage}
@@ -75,11 +83,12 @@ const SendHeading = () => {
       >{`${displayTransferValue} ${tokenSymbol}`}</Text>
     );
 
-  const TokenFiatValue = fiatDisplayValue && (
-    <Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
-      {fiatDisplayValue}
-    </Text>
-  );
+  const TokenFiatValue = Boolean(fiatDisplayValue) &&
+    (!isTestnet || showFiatInTestnets) && (
+      <Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
+        {fiatDisplayValue}
+      </Text>
+    );
 
   if (pending) {
     return <ConfirmLoader />;

From 4a53aea844233135f1032b620763d11aadffe788 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:32:18 +0100
Subject: [PATCH 024/111] =?UTF-8?q?fix:=20unit=20flaky=20test=20`AddContac?=
 =?UTF-8?q?t=20component=20=E2=80=BA=20should=20disable=20submit=20button?=
 =?UTF-8?q?=20when=20input=20is=20not=20a=20valid=20address`=20(#27941)?=
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 unit test for Add Account is flaky as sometimes the
state[name].stage var is undefined so it breaks at this point:

![Screenshot from 2024-10-18
09-22-26](https://github.com/user-attachments/assets/16c5c833-bce8-44c5-b32f-eaae49aa6258)

Update: [as Mark pointed
out](https://github.com/MetaMask/metamask-extension/pull/27941#issuecomment-2452364332),
another flakiness point appeared after the first one was fixed, also due
to missing some state mocks.

The fix is to add the missing mocks in the test setup, so they always
defined.

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

## **Related issues**

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

## **Manual testing steps**

1. Check runs. After the 2 fixes, I've re-run the unit tests in github
x3 times and they all passed

![Screenshot from 2024-11-05
10-57-30](https://github.com/user-attachments/assets/62d0746f-0831-4887-9c63-8a22cec4df56)


## **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**

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

diff --git a/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js b/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
index d0936752c78c..af130617ae19 100644
--- a/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
+++ b/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
@@ -6,6 +6,7 @@ import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import '@testing-library/jest-dom/extend-expect';
 import { mockNetworkState } from '../../../../../test/stub/networks';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
+import { domainInitialState } from '../../../../ducks/domains';
 import AddContact from './add-contact.component';
 
 describe('AddContact component', () => {
@@ -61,7 +62,12 @@ describe('AddContact component', () => {
   });
 
   it('should enable submit button when input is valid', () => {
-    const store = configureMockStore(middleware)(state);
+    const testStore = {
+      DNS: domainInitialState,
+      metamask: state.metamask,
+      snaps: {},
+    };
+    const store = configureMockStore(middleware)(testStore);
     const { getByText, getByTestId } = renderWithProvider(
       <AddContact {...props} />,
       store,
@@ -80,7 +86,12 @@ describe('AddContact component', () => {
   });
 
   it('should disable submit button when input is not a valid address', () => {
-    const store = configureMockStore(middleware)(state);
+    const testStore = {
+      DNS: domainInitialState,
+      metamask: state.metamask,
+      snaps: {},
+    };
+    const store = configureMockStore(middleware)(testStore);
     const { getByText, getByTestId } = renderWithProvider(
       <AddContact {...props} />,
       store,

From 572496aff613f672e56ca2881ec3f8705541fc87 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Tue, 5 Nov 2024 15:47:09 +0000
Subject: [PATCH 025/111] fix: smart transactions in redesigned confirmations
 (#28273)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Ensure smart transaction feature flags are refreshed when redesigned
confirmations are shown.

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

## **Related issues**

## **Manual testing steps**

1. Install fresh extension.
2. Create transaction using redesigned confirmation.
3. Ensure smart transaction is performed.

## **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.
---
 test/data/confirmations/helper.ts             |   1 +
 .../components/confirm/info/info.tsx          |   4 +
 .../useSmartTransactionFeatureFlags.test.ts   | 119 ++++++++++++++++++
 .../hooks/useSmartTransactionFeatureFlags.ts  |  53 ++++++++
 4 files changed, 177 insertions(+)
 create mode 100644 ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.test.ts
 create mode 100644 ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.ts

diff --git a/test/data/confirmations/helper.ts b/test/data/confirmations/helper.ts
index 6669c043d0ea..b8bd8a634588 100644
--- a/test/data/confirmations/helper.ts
+++ b/test/data/confirmations/helper.ts
@@ -133,6 +133,7 @@ export const getMockConfirmState = (args: RootState = { metamask: {} }) => ({
     ...args.metamask,
     preferences: {
       ...mockState.metamask.preferences,
+      ...(args.metamask?.preferences as Record<string, unknown>),
       redesignedTransactionsEnabled: true,
       redesignedConfirmationsEnabled: true,
       isRedesignedConfirmationsDeveloperEnabled: true,
diff --git a/ui/pages/confirmations/components/confirm/info/info.tsx b/ui/pages/confirmations/components/confirm/info/info.tsx
index f283cbfc2e61..642d1d70c017 100644
--- a/ui/pages/confirmations/components/confirm/info/info.tsx
+++ b/ui/pages/confirmations/components/confirm/info/info.tsx
@@ -2,6 +2,7 @@ import { TransactionType } from '@metamask/transaction-controller';
 import React, { useMemo } from 'react';
 import { useConfirmContext } from '../../../context/confirm';
 import { SignatureRequestType } from '../../../types/confirm';
+import { useSmartTransactionFeatureFlags } from '../../../hooks/useSmartTransactionFeatureFlags';
 import ApproveInfo from './approve/approve';
 import BaseTransactionInfo from './base-transaction-info/base-transaction-info';
 import NativeTransferInfo from './native-transfer/native-transfer';
@@ -15,6 +16,9 @@ import TypedSignInfo from './typed-sign/typed-sign';
 const Info = () => {
   const { currentConfirmation } = useConfirmContext();
 
+  // TODO: Create TransactionInfo and SignatureInfo components.
+  useSmartTransactionFeatureFlags();
+
   const ConfirmationInfoComponentMap = useMemo(
     () => ({
       [TransactionType.contractInteraction]: () => BaseTransactionInfo,
diff --git a/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.test.ts b/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.test.ts
new file mode 100644
index 000000000000..708a78b5b1eb
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.test.ts
@@ -0,0 +1,119 @@
+import { act } from 'react-dom/test-utils';
+import { useDispatch } from 'react-redux';
+import { CHAIN_IDS, TransactionMeta } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
+import {
+  fetchSmartTransactionsLiveness,
+  setSwapsFeatureFlags,
+} from '../../../store/actions';
+import { renderHookWithConfirmContextProvider } from '../../../../test/lib/confirmations/render-helpers';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../test/data/confirmations/contract-interaction';
+import { getMockConfirmStateForTransaction } from '../../../../test/data/confirmations/helper';
+import { mockNetworkState } from '../../../../test/stub/networks';
+import { fetchSwapsFeatureFlags } from '../../swaps/swaps.util';
+import { useSmartTransactionFeatureFlags } from './useSmartTransactionFeatureFlags';
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: jest.fn(),
+}));
+
+jest.mock('../../../store/actions', () => ({
+  ...jest.requireActual('../../../store/actions'),
+  setSwapsFeatureFlags: jest.fn(),
+  fetchSmartTransactionsLiveness: jest.fn(),
+}));
+
+jest.mock('../../swaps/swaps.util', () => ({
+  ...jest.requireActual('../../swaps/swaps.util'),
+  fetchSwapsFeatureFlags: jest.fn(),
+}));
+
+async function runHook({
+  smartTransactionsOptInStatus,
+  chainId,
+  confirmation,
+}: {
+  smartTransactionsOptInStatus: boolean;
+  chainId: Hex;
+  confirmation?: Partial<TransactionMeta>;
+}) {
+  const transaction =
+    (confirmation as TransactionMeta) ??
+    genUnapprovedContractInteractionConfirmation({
+      chainId,
+    });
+
+  const state = getMockConfirmStateForTransaction(transaction, {
+    metamask: {
+      ...mockNetworkState({ chainId, id: 'Test' }),
+      selectedNetworkClientId: 'Test',
+      preferences: {
+        smartTransactionsOptInStatus,
+      },
+    },
+  });
+
+  renderHookWithConfirmContextProvider(
+    () => useSmartTransactionFeatureFlags(),
+    state,
+  );
+
+  await act(async () => {
+    // Intentionally empty
+  });
+}
+
+describe('useSmartTransactionFeatureFlags', () => {
+  const setSwapsFeatureFlagsMock = jest.mocked(setSwapsFeatureFlags);
+  const fetchSwapsFeatureFlagsMock = jest.mocked(fetchSwapsFeatureFlags);
+  const fetchSmartTransactionsLivenessMock = jest.mocked(
+    fetchSmartTransactionsLiveness,
+  );
+  const useDispatchMock = jest.mocked(useDispatch);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useDispatchMock.mockReturnValue(jest.fn());
+    fetchSwapsFeatureFlagsMock.mockResolvedValue({});
+    fetchSmartTransactionsLivenessMock.mockReturnValue(() => Promise.resolve());
+  });
+
+  it('updates feature flags', async () => {
+    await runHook({
+      smartTransactionsOptInStatus: true,
+      chainId: CHAIN_IDS.MAINNET,
+    });
+
+    expect(setSwapsFeatureFlagsMock).toHaveBeenCalledTimes(1);
+    expect(setSwapsFeatureFlagsMock).toHaveBeenCalledWith({});
+  });
+
+  it('does not update feature flags if smart transactions disabled', async () => {
+    await runHook({
+      smartTransactionsOptInStatus: false,
+      chainId: CHAIN_IDS.MAINNET,
+    });
+
+    expect(setSwapsFeatureFlagsMock).not.toHaveBeenCalled();
+  });
+
+  it('does not update feature flags if chain not supported', async () => {
+    await runHook({
+      smartTransactionsOptInStatus: true,
+      chainId: CHAIN_IDS.ARBITRUM,
+    });
+
+    expect(setSwapsFeatureFlagsMock).not.toHaveBeenCalled();
+  });
+
+  it('does not update feature flags if confirmation is not transaction', async () => {
+    await runHook({
+      smartTransactionsOptInStatus: true,
+      chainId: CHAIN_IDS.MAINNET,
+      confirmation: {},
+    });
+
+    expect(setSwapsFeatureFlagsMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.ts b/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.ts
new file mode 100644
index 000000000000..099327eb211f
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useSmartTransactionFeatureFlags.ts
@@ -0,0 +1,53 @@
+import { useDispatch, useSelector } from 'react-redux';
+import { useEffect } from 'react';
+import { TransactionMeta } from '@metamask/transaction-controller';
+import log from 'loglevel';
+import {
+  getCurrentChainSupportsSmartTransactions,
+  getSmartTransactionsPreferenceEnabled,
+} from '../../../../shared/modules/selectors';
+import { fetchSwapsFeatureFlags } from '../../swaps/swaps.util';
+import {
+  fetchSmartTransactionsLiveness,
+  setSwapsFeatureFlags,
+} from '../../../store/actions';
+import { useConfirmContext } from '../context/confirm';
+
+export function useSmartTransactionFeatureFlags() {
+  const dispatch = useDispatch();
+  const { currentConfirmation } = useConfirmContext<TransactionMeta>();
+  const { id: transactionId, txParams } = currentConfirmation ?? {};
+  const isTransaction = Boolean(txParams);
+
+  const smartTransactionsPreferenceEnabled = useSelector(
+    getSmartTransactionsPreferenceEnabled,
+  );
+
+  const currentChainSupportsSmartTransactions = useSelector(
+    getCurrentChainSupportsSmartTransactions,
+  );
+
+  useEffect(() => {
+    if (
+      !isTransaction ||
+      !transactionId ||
+      !smartTransactionsPreferenceEnabled ||
+      !currentChainSupportsSmartTransactions
+    ) {
+      return;
+    }
+
+    Promise.all([fetchSwapsFeatureFlags(), fetchSmartTransactionsLiveness()()])
+      .then(([swapsFeatureFlags]) => {
+        dispatch(setSwapsFeatureFlags(swapsFeatureFlags));
+      })
+      .catch((error) => {
+        log.debug('Error updating smart transaction feature flags', error);
+      });
+  }, [
+    isTransaction,
+    transactionId,
+    smartTransactionsPreferenceEnabled,
+    currentChainSupportsSmartTransactions,
+  ]);
+}

From 82c19108fff54dfa24ba79c156533510f0bd1f98 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 6 Nov 2024 00:04:15 +0700
Subject: [PATCH 026/111] feat: Add simulation metrics to "Transaction
 Submitted" and "Transaction Finalized" events (#28240)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR adds simulation metrics to the `Transaction Submitted` and
`Transaction Finalized` events.

Please refer to **Solution B)** below for details.

----



The challenge here is that there are two separate transaction fragment
buckets: `transaction-added-<id>` and `transaction-submitted-<id>`.
 `transaction-added-<id>` fragments are associated with the events:
- Transaction Added
- Transaction Approved
- Transaction Rejected

`transaction-submitted-<id>` fragments are associated with the events:
- Transaction Submitted
- Transaction Finalized

Simulation metrics were added to "Transaction Approved" and "Transaction
Rejected" events using updateEventFragment. When they were added here
through the useTransactionEventFragment hook, the
`transaction-submitted-<id>` fragment had not yet been created. The
`transaction-submitted-<id>` fragment is created after a user clicks the
Confirm button on a transaction which invokes
metrics#handleTransactionSubmitted and calls
createTransactionEventFragment

To solve this, I proposed two solutions (TLDR; went with Solution B):

#### Solution A)
- Create a single transaction fragment ID to handle all related
transaction events. Here, the fragment would specify the props:
```
initialEvent: "Transaction Added"
successEvent:"Transaction Finalized"
failureEvent: "Transaction Rejected"
```
- Add new method to MetaMetricsController to call trackEvent with
specified eventName utilizing fragment props. This would support calling
"Transaction Approved" and "Transaction Submitted" ad-hoc style.

#### Solution B)
- Allow a premature fragment to exist for `transaction-submitted-<id>`
fragment. Prior to this PR fragments only exist once they are created.
- From  useTransactionEventFragment hook
  - Adds a premature `transaction-submitted-<id>` fragment
- Calls "updateEventFragment(`transaction-submitted-${transactionId}`,
params)" to store simulation metric props
- When handleTransactionSubmitted event is invoked, creating the
fragment now merges the premature fragment with the newly created
fragment
- When a premature fragment is found as an abandoned fragment, we delete
it from the store

#### Solution C)
- store unlinked props in new store state: fragmentsUnlinkedProps on
updateEventFragment
- fragmentsUnlinkedProps can be applied to newly created fragments on
createEventFragment
- deleted abandoned fragmentsUnlinkedProps would need more investigation

I went with solution B due to time constraints.

## **Related issues**

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

## **Manual testing steps**

1. Turn on "Participate in MetaMetrics" setting
2. Confirm or Reject a Send transaction
3. Observe simulation props are added to `Transaction Submitted` and
`Transaction Finalized` events

## **Screenshots/Recordings**

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

no UI/UX changes

### **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/controllers/metametrics.test.ts   | 200 +++++++++++++++++-
 app/scripts/controllers/metametrics.ts        |  70 +++++-
 app/scripts/lib/transaction/metrics.ts        |  24 +--
 shared/constants/metametrics.ts               |   7 +
 .../hooks/useTransactionEventFragment.js      |   1 +
 5 files changed, 280 insertions(+), 22 deletions(-)

diff --git a/app/scripts/controllers/metametrics.test.ts b/app/scripts/controllers/metametrics.test.ts
index c0a544073614..4b2a1f09a562 100644
--- a/app/scripts/controllers/metametrics.test.ts
+++ b/app/scripts/controllers/metametrics.test.ts
@@ -10,6 +10,7 @@ import {
 import { InternalAccount } from '@metamask/keyring-api';
 import { Browser } from 'webextension-polyfill';
 import { Hex } from '@metamask/utils';
+import { merge } from 'lodash';
 import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
 import { createSegmentMock } from '../lib/segment';
 import {
@@ -93,8 +94,19 @@ const DEFAULT_PAGE_PROPERTIES = {
   ...DEFAULT_SHARED_PROPERTIES,
 };
 
-const SAMPLE_PERSISTED_EVENT = {
-  id: 'testid',
+const SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT = {
+  id: 'transaction-submitted-0000',
+  canDeleteIfAbandoned: true,
+  category: 'Unit Test',
+  successEvent: 'Transaction Finalized',
+  persist: true,
+  properties: {
+    simulation_response: 'no_balance_change',
+    test_stored_prop: 1,
+  },
+};
+
+const SAMPLE_PERSISTED_EVENT_NO_ID = {
   persist: true,
   category: 'Unit Test',
   successEvent: 'sample persisted event success',
@@ -104,6 +116,11 @@ const SAMPLE_PERSISTED_EVENT = {
   },
 };
 
+const SAMPLE_PERSISTED_EVENT = {
+  id: 'testid',
+  ...SAMPLE_PERSISTED_EVENT_NO_ID,
+};
+
 const SAMPLE_NON_PERSISTED_EVENT = {
   id: 'testid2',
   persist: false,
@@ -255,6 +272,185 @@ describe('MetaMetricsController', function () {
     });
   });
 
+  describe('createEventFragment', function () {
+    it('should throw an error if the param is missing successEvent or category', async function () {
+      const metaMetricsController = getMetaMetricsController();
+
+      await expect(() => {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error because we are testing the error case
+        metaMetricsController.createEventFragment({ event: 'test' });
+      }).toThrow(/Must specify success event and category\./u);
+
+      await expect(() => {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error because we are testing the error case
+        metaMetricsController.createEventFragment({ category: 'test' });
+      }).toThrow(/Must specify success event and category\./u);
+    });
+
+    it('should update fragments state with new fragment', function () {
+      jest.useFakeTimers().setSystemTime(1730798301422);
+
+      const metaMetricsController = getMetaMetricsController();
+      const mockNewId = 'testid3';
+
+      metaMetricsController.createEventFragment({
+        ...SAMPLE_PERSISTED_EVENT_NO_ID,
+        uniqueIdentifier: mockNewId,
+      });
+
+      const resultFragment = metaMetricsController.state.fragments[mockNewId];
+
+      expect(resultFragment).toStrictEqual({
+        ...SAMPLE_PERSISTED_EVENT_NO_ID,
+        id: mockNewId,
+        uniqueIdentifier: mockNewId,
+        lastUpdated: 1730798301422,
+      });
+
+      jest.useRealTimers();
+    });
+
+    it('should track the initial event if provided', function () {
+      const metaMetricsController = getMetaMetricsController({
+        participateInMetaMetrics: true,
+      });
+      const spy = jest.spyOn(segmentMock, 'track');
+      const mockInitialEventName = 'Test Initial Event';
+
+      metaMetricsController.createEventFragment({
+        ...SAMPLE_PERSISTED_EVENT_NO_ID,
+        initialEvent: mockInitialEventName,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not call track if no initialEvent was provided', function () {
+      const metaMetricsController = getMetaMetricsController({
+        participateInMetaMetrics: true,
+      });
+      const spy = jest.spyOn(segmentMock, 'track');
+
+      metaMetricsController.createEventFragment({
+        ...SAMPLE_PERSISTED_EVENT_NO_ID,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    describe('when intialEvent is "Transaction Submitted" and a fragment exists before createEventFragment is called', function () {
+      it('should update existing fragment state with new fragment props', function () {
+        jest.useFakeTimers().setSystemTime(1730798302222);
+
+        const metaMetricsController = getMetaMetricsController();
+        const { id } = SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT;
+
+        metaMetricsController.updateEventFragment(
+          SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT.id,
+          {
+            ...SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
+          },
+        );
+        metaMetricsController.createEventFragment({
+          ...SAMPLE_PERSISTED_EVENT_NO_ID,
+          initialEvent: 'Transaction Submitted',
+          uniqueIdentifier: id,
+        });
+
+        const resultFragment = metaMetricsController.state.fragments[id];
+        const expectedFragment = merge(
+          SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
+          SAMPLE_PERSISTED_EVENT_NO_ID,
+          {
+            canDeleteIfAbandoned: false,
+            id,
+            initialEvent: 'Transaction Submitted',
+            uniqueIdentifier: id,
+            lastUpdated: 1730798302222,
+          },
+        );
+
+        expect(resultFragment).toStrictEqual(expectedFragment);
+
+        jest.useRealTimers();
+      });
+    });
+  });
+
+  describe('updateEventFragment', function () {
+    beforeEach(function () {
+      jest.useFakeTimers().setSystemTime(1730798303333);
+    });
+    afterEach(function () {
+      jest.useRealTimers();
+    });
+
+    it('updates fragment with additional provided props', async function () {
+      const metaMetricsController = getMetaMetricsController();
+      const MOCK_PROPS_TO_UPDATE = {
+        properties: {
+          test: 1,
+        },
+      };
+
+      metaMetricsController.updateEventFragment(
+        SAMPLE_PERSISTED_EVENT.id,
+        MOCK_PROPS_TO_UPDATE,
+      );
+
+      const resultFragment =
+        metaMetricsController.state.fragments[SAMPLE_PERSISTED_EVENT.id];
+      const expectedPartialFragment = {
+        ...SAMPLE_PERSISTED_EVENT,
+        ...MOCK_PROPS_TO_UPDATE,
+        lastUpdated: 1730798303333,
+      };
+      expect(resultFragment).toStrictEqual(expectedPartialFragment);
+    });
+
+    it('throws error when no existing fragment exists', async function () {
+      const metaMetricsController = getMetaMetricsController();
+
+      const MOCK_NONEXISTING_ID = 'test-nonexistingid';
+
+      await expect(() => {
+        metaMetricsController.updateEventFragment(MOCK_NONEXISTING_ID, {
+          properties: { test: 1 },
+        });
+      }).toThrow(/Event fragment with id test-nonexistingid does not exist\./u);
+    });
+
+    describe('when id includes "transaction-submitted"', function () {
+      it('creates and stores new fragment props with canDeleteIfAbandoned set to true', function () {
+        const metaMetricsController = getMetaMetricsController();
+        const MOCK_ID = 'transaction-submitted-1111';
+        const MOCK_PROPS_TO_UPDATE = {
+          properties: {
+            test: 1,
+          },
+        };
+
+        metaMetricsController.updateEventFragment(
+          MOCK_ID,
+          MOCK_PROPS_TO_UPDATE,
+        );
+
+        const resultFragment = metaMetricsController.state.fragments[MOCK_ID];
+        const expectedPartialFragment = {
+          ...MOCK_PROPS_TO_UPDATE,
+          category: 'Transactions',
+          canDeleteIfAbandoned: true,
+          id: MOCK_ID,
+          lastUpdated: 1730798303333,
+          successEvent: 'Transaction Finalized',
+        };
+        expect(resultFragment).toStrictEqual(expectedPartialFragment);
+      });
+    });
+  });
+
   describe('generateMetaMetricsId', function () {
     it('should generate an 0x prefixed hex string', function () {
       const metaMetricsController = getMetaMetricsController();
diff --git a/app/scripts/controllers/metametrics.ts b/app/scripts/controllers/metametrics.ts
index 915fcbf53250..ded99dd917f4 100644
--- a/app/scripts/controllers/metametrics.ts
+++ b/app/scripts/controllers/metametrics.ts
@@ -32,6 +32,7 @@ import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
 import {
   METAMETRICS_ANONYMOUS_ID,
   METAMETRICS_BACKGROUND_PAGE_OBJECT,
+  MetaMetricsEventCategory,
   MetaMetricsEventName,
   MetaMetricsEventFragment,
   MetaMetricsUserTrait,
@@ -312,7 +313,7 @@ export default class MetaMetricsController {
     // fragments that are not marked as persistent will be purged and the
     // failure event will be emitted.
     Object.values(abandonedFragments).forEach((fragment) => {
-      this.finalizeEventFragment(fragment.id, { abandoned: true });
+      this.processAbandonedFragment(fragment);
     });
 
     // Code below submits any pending segmentApiCalls to Segment if/when the controller is re-instantiated
@@ -368,7 +369,7 @@ export default class MetaMetricsController {
         fragment.lastUpdated &&
         Date.now() - fragment.lastUpdated / 1000 > fragment.timeout
       ) {
-        this.finalizeEventFragment(fragment.id, { abandoned: true });
+        this.processAbandonedFragment(fragment);
       }
     });
   }
@@ -414,10 +415,30 @@ export default class MetaMetricsController {
       ...options,
       lastUpdated: Date.now(),
     };
+
+    /**
+     * HACK: "transaction-submitted-<id>" fragment hack
+     * A "transaction-submitted-<id>" fragment may exist following the "Transaction Added"
+     * event to persist accumulated event fragment props to the "Transaction Submitted" event
+     * which fires after a user confirms a transaction. Rejecting a confirmation does not fire the
+     * "Transaction Submitted" event. In this case, these abandoned fragments will be deleted
+     * instead of finalized with canDeleteIfAbandoned set to true.
+     */
+    const hasExistingSubmittedFragment =
+      options.initialEvent === TransactionMetaMetricsEvent.submitted &&
+      fragments[id];
+
+    const additionalFragmentProps = hasExistingSubmittedFragment
+      ? {
+          ...fragments[id],
+          canDeleteIfAbandoned: false,
+        }
+      : {};
+
     this.store.updateState({
       fragments: {
         ...fragments,
-        [id]: fragment,
+        [id]: merge(additionalFragmentProps, fragment),
       },
     });
 
@@ -455,6 +476,19 @@ export default class MetaMetricsController {
     return fragment;
   }
 
+  /**
+   * Deletes to finalizes event fragment based on the canDeleteIfAbandoned property.
+   *
+   * @param fragment
+   */
+  processAbandonedFragment(fragment: MetaMetricsEventFragment): void {
+    if (fragment.canDeleteIfAbandoned) {
+      this.deleteEventFragment(fragment.id);
+    } else {
+      this.finalizeEventFragment(fragment.id, { abandoned: true });
+    }
+  }
+
   /**
    * Updates an event fragment in state
    *
@@ -469,7 +503,22 @@ export default class MetaMetricsController {
 
     const fragment = fragments[id];
 
-    if (!fragment) {
+    /**
+     * HACK: "transaction-submitted-<id>" fragment hack
+     * Creates a "transaction-submitted-<id>" fragment if it does not exist to persist
+     * accumulated event metrics. In the case it is unused, the abandoned fragment will
+     * eventually be deleted with canDeleteIfAbandoned set to true.
+     */
+    const createIfNotFound = !fragment && id.includes('transaction-submitted-');
+
+    if (createIfNotFound) {
+      fragments[id] = {
+        canDeleteIfAbandoned: true,
+        category: MetaMetricsEventCategory.Transactions,
+        successEvent: TransactionMetaMetricsEvent.finalized,
+        id,
+      };
+    } else if (!fragment) {
       throw new Error(`Event fragment with id ${id} does not exist.`);
     }
 
@@ -484,6 +533,19 @@ export default class MetaMetricsController {
     });
   }
 
+  /**
+   * Deletes an event fragment from state
+   *
+   * @param id - The fragment id to delete
+   */
+  deleteEventFragment(id: string): void {
+    const { fragments } = this.store.getState();
+
+    if (fragments[id]) {
+      delete fragments[id];
+    }
+  }
+
   /**
    * Finalizes a fragment, tracking either a success event or failure Event
    * and then removes the fragment from state.
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index b33be10c8df4..1e0e26dc1c20 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -528,7 +528,12 @@ function createTransactionEventFragment({
       transactionMetricsRequest.getEventFragmentById,
       eventName,
       transactionMeta,
-    )
+    ) &&
+    /**
+     * HACK: "transaction-submitted-<id>" fragment hack
+     * can continue to createEventFragment if "transaction-submitted-<id>"  submitted fragment exists
+     */
+    eventName !== TransactionMetaMetricsEvent.submitted
   ) {
     return;
   }
@@ -642,25 +647,14 @@ function updateTransactionEventFragment({
 
   switch (eventName) {
     case TransactionMetaMetricsEvent.approved:
-      transactionMetricsRequest.updateEventFragment(uniqueId, {
-        properties: payload.properties,
-        sensitiveProperties: payload.sensitiveProperties,
-      });
-      break;
-
     case TransactionMetaMetricsEvent.rejected:
-      transactionMetricsRequest.updateEventFragment(uniqueId, {
-        properties: payload.properties,
-        sensitiveProperties: payload.sensitiveProperties,
-      });
-      break;
-
     case TransactionMetaMetricsEvent.finalized:
       transactionMetricsRequest.updateEventFragment(uniqueId, {
         properties: payload.properties,
         sensitiveProperties: payload.sensitiveProperties,
       });
       break;
+
     default:
       break;
   }
@@ -679,6 +673,7 @@ function finalizeTransactionEventFragment({
 
   switch (eventName) {
     case TransactionMetaMetricsEvent.approved:
+    case TransactionMetaMetricsEvent.finalized:
       transactionMetricsRequest.finalizeEventFragment(uniqueId);
       break;
 
@@ -688,9 +683,6 @@ function finalizeTransactionEventFragment({
       });
       break;
 
-    case TransactionMetaMetricsEvent.finalized:
-      transactionMetricsRequest.finalizeEventFragment(uniqueId);
-      break;
     default:
       break;
   }
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 4a5c21ab5752..4096d04b11d6 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -247,6 +247,13 @@ export type MetaMetricsEventFragment = {
    * The event name.
    */
   event?: string;
+
+  /**
+   * HACK: "transaction-submitted-<id>" fragment hack
+   * If this is true and the fragment is found as an abandoned fragment,
+   * then delete the fragment instead of finalizing it.
+   */
+  canDeleteIfAbandoned?: boolean;
 };
 
 /**
diff --git a/ui/pages/confirmations/hooks/useTransactionEventFragment.js b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
index b28b1fd02a54..c69cbb8fc80f 100644
--- a/ui/pages/confirmations/hooks/useTransactionEventFragment.js
+++ b/ui/pages/confirmations/hooks/useTransactionEventFragment.js
@@ -31,6 +31,7 @@ export const useTransactionEventFragment = () => {
         await createTransactionEventFragment(transactionId);
       }
       updateEventFragment(`transaction-added-${transactionId}`, params);
+      updateEventFragment(`transaction-submitted-${transactionId}`, params);
     },
     [fragmentExists, gasTransactionId],
   );

From 93e3872721e2010361c759df8d9523f035c64b00 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Tue, 5 Nov 2024 21:56:26 +0100
Subject: [PATCH 027/111] chore: Bump Snaps packages (#28215)

<!--
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**

Bump Snaps packages and handle any required changes.

Summary of Snaps changes:
- Add `truncate`, `displayName` and `avatar` props to `Address`
component
- Reduce unnecessary JSON validation (performance improvement)
- Allow `platformVersion` in the manifest and reject invalid versions
when specified in stable
- Add Kadena derivation path
- Bump MetaMask dependencies

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

---------

Co-authored-by: David Drazic <david@timechaser.org>
Co-authored-by: Guillaume Roux <hello@guillaumerx.fr>
---
 app/scripts/metamask-controller.js            |   3 +
 builds.yml                                    |  12 +-
 lavamoat/browserify/beta/policy.json          | 245 ++++++++++--------
 lavamoat/browserify/flask/policy.json         | 245 ++++++++++--------
 lavamoat/browserify/main/policy.json          | 245 ++++++++++--------
 lavamoat/browserify/mmi/policy.json           | 245 ++++++++++--------
 package.json                                  |  12 +-
 test/e2e/snaps/enums.js                       |   2 +-
 .../snap-ui-address.test.tsx.snap             |  13 +
 .../snaps/snap-ui-address/snap-ui-address.tsx |  35 ++-
 .../snap-ui-renderer/components/address.ts    |   3 +
 yarn.lock                                     | 187 ++++++-------
 12 files changed, 721 insertions(+), 526 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ac72ba85dd84..e7e115e6ed7c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1374,6 +1374,8 @@ export default class MetamaskController extends EventEmitter {
 
     const allowLocalSnaps = process.env.ALLOW_LOCAL_SNAPS;
     const requireAllowlist = process.env.REQUIRE_SNAPS_ALLOWLIST;
+    const rejectInvalidPlatformVersion =
+      process.env.REJECT_INVALID_SNAPS_PLATFORM_VERSION;
 
     this.snapController = new SnapController({
       environmentEndowmentPermissions: Object.values(EndowmentPermissions),
@@ -1388,6 +1390,7 @@ export default class MetamaskController extends EventEmitter {
         dappsCanUpdateSnaps: true,
         allowLocalSnaps,
         requireAllowlist,
+        rejectInvalidPlatformVersion,
       },
       encryptor: encryptorFactory(600_000),
       getMnemonic: this.getPrimaryKeyringMnemonic.bind(this),
diff --git a/builds.yml b/builds.yml
index 824e08e32167..1392950860e2 100644
--- a/builds.yml
+++ b/builds.yml
@@ -26,7 +26,8 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.1/index.html
+      - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.2/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Main build uses the default browser manifest
     manifestOverrides: false
@@ -46,7 +47,8 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_BETA_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.1/index.html
+      - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.2/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Modifies how the version is displayed.
     # eg. instead of 10.25.0 -> 10.25.0-beta.2
@@ -67,7 +69,8 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.1/index.html
+      - REJECT_INVALID_SNAPS_PLATFORM_VERSION: false
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.2/index.html
       - SUPPORT_LINK: https://support.metamask.io/
       - SUPPORT_REQUEST_LINK: https://support.metamask.io/
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -90,7 +93,8 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.1/index.html
+      - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.9.2/index.html
       - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
       - SUPPORT_LINK: https://support.metamask-institutional.io
       - SUPPORT_REQUEST_LINK: https://support.metamask-institutional.io
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index ac719964d896..108abcb4dd9a 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -630,23 +630,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
-        "@metamask/approval-controller>@metamask/rpc-errors": true,
-        "@metamask/approval-controller>nanoid": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1321,11 +1307,26 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
         "readable-stream": true
       }
     },
+    "@metamask/json-rpc-middleware-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/keyring-api": {
       "globals": {
         "URL": true
@@ -2527,7 +2528,22 @@
     "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors>@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-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/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": {
@@ -2561,13 +2577,14 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2578,11 +2595,11 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
-        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
-        "readable-stream": true
+        "readable-stream": true,
+        "semver": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2590,40 +2607,34 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/rpc-errors": {
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-controllers>concat-stream": {
@@ -2677,18 +2688,34 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2698,40 +2725,34 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/rpc-errors": {
+    "@metamask/snaps-rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-sdk": {
@@ -2739,8 +2760,8 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/snaps-sdk>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2753,10 +2774,19 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/rpc-errors": {
+    "@metamask/snaps-sdk>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-utils": {
@@ -2775,18 +2805,18 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2794,55 +2824,64 @@
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-utils>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index ac719964d896..108abcb4dd9a 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -630,23 +630,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
-        "@metamask/approval-controller>@metamask/rpc-errors": true,
-        "@metamask/approval-controller>nanoid": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1321,11 +1307,26 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
         "readable-stream": true
       }
     },
+    "@metamask/json-rpc-middleware-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/keyring-api": {
       "globals": {
         "URL": true
@@ -2527,7 +2528,22 @@
     "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors>@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-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/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": {
@@ -2561,13 +2577,14 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2578,11 +2595,11 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
-        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
-        "readable-stream": true
+        "readable-stream": true,
+        "semver": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2590,40 +2607,34 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/rpc-errors": {
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-controllers>concat-stream": {
@@ -2677,18 +2688,34 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2698,40 +2725,34 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/rpc-errors": {
+    "@metamask/snaps-rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-sdk": {
@@ -2739,8 +2760,8 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/snaps-sdk>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2753,10 +2774,19 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/rpc-errors": {
+    "@metamask/snaps-sdk>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-utils": {
@@ -2775,18 +2805,18 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2794,55 +2824,64 @@
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-utils>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index ac719964d896..108abcb4dd9a 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -630,23 +630,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
-        "@metamask/approval-controller>@metamask/rpc-errors": true,
-        "@metamask/approval-controller>nanoid": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1321,11 +1307,26 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
         "readable-stream": true
       }
     },
+    "@metamask/json-rpc-middleware-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/keyring-api": {
       "globals": {
         "URL": true
@@ -2527,7 +2528,22 @@
     "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors>@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-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/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": {
@@ -2561,13 +2577,14 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2578,11 +2595,11 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
-        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
-        "readable-stream": true
+        "readable-stream": true,
+        "semver": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2590,40 +2607,34 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/rpc-errors": {
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-controllers>concat-stream": {
@@ -2677,18 +2688,34 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2698,40 +2725,34 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/rpc-errors": {
+    "@metamask/snaps-rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-sdk": {
@@ -2739,8 +2760,8 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/snaps-sdk>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2753,10 +2774,19 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/rpc-errors": {
+    "@metamask/snaps-sdk>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-utils": {
@@ -2775,18 +2805,18 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2794,55 +2824,64 @@
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-utils>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 1b4e98aae177..ec387ee6733f 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -722,23 +722,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
-        "@metamask/approval-controller>@metamask/rpc-errors": true,
-        "@metamask/approval-controller>nanoid": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/approval-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1413,11 +1399,26 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
         "readable-stream": true
       }
     },
+    "@metamask/json-rpc-middleware-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/keyring-api": {
       "globals": {
         "URL": true
@@ -2619,7 +2620,22 @@
     "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors>@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-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/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": {
@@ -2653,13 +2669,14 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/json-rpc-engine": true,
         "@metamask/json-rpc-middleware-stream": true,
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2670,11 +2687,11 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
-        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
-        "readable-stream": true
+        "readable-stream": true,
+        "semver": true
       }
     },
     "@metamask/snaps-controllers-flask>nanoid": {
@@ -2682,40 +2699,34 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
-        "@metamask/snaps-controllers>@metamask/rpc-errors": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
-        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/rpc-errors": {
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-controllers>concat-stream": {
@@ -2769,18 +2780,34 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2790,40 +2817,34 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-rpc-methods>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@metamask/rpc-errors": {
+    "@metamask/snaps-rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-sdk": {
@@ -2831,8 +2852,8 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/snaps-sdk>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2845,10 +2866,19 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/rpc-errors": {
+    "@metamask/snaps-sdk>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/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/snaps-utils": {
@@ -2867,18 +2897,18 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2886,55 +2916,64 @@
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller": {
       "globals": {
         "console.error": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/snaps-utils>@metamask/base-controller": true,
-        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-utils>@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-utils>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
diff --git a/package.json b/package.json
index cad47b45c8f3..1672e6845873 100644
--- a/package.json
+++ b/package.json
@@ -233,7 +233,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.9.0",
+    "@metamask/snaps-sdk": "^6.10.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",
@@ -341,11 +341,11 @@
     "@metamask/selected-network-controller": "^18.0.2",
     "@metamask/signature-controller": "^21.0.0",
     "@metamask/smart-transactions-controller": "^13.0.0",
-    "@metamask/snaps-controllers": "^9.11.1",
-    "@metamask/snaps-execution-environments": "^6.9.1",
-    "@metamask/snaps-rpc-methods": "^11.5.0",
-    "@metamask/snaps-sdk": "^6.9.0",
-    "@metamask/snaps-utils": "^8.4.1",
+    "@metamask/snaps-controllers": "^9.12.0",
+    "@metamask/snaps-execution-environments": "^6.9.2",
+    "@metamask/snaps-rpc-methods": "^11.5.1",
+    "@metamask/snaps-sdk": "^6.10.0",
+    "@metamask/snaps-utils": "^8.5.1",
     "@metamask/transaction-controller": "^38.1.0",
     "@metamask/user-operation-controller": "^13.0.0",
     "@metamask/utils": "^9.3.0",
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index 7fdbf5e1fd24..30037479fca8 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.2',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.15.3',
 };
diff --git a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
index 7dd3749a6e5f..deb95bd48555 100644
--- a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
+++ b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
@@ -46,6 +46,7 @@ exports[`SnapUIAddress renders Bitcoin address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       128Lkh3...Mp8p6
     </p>
@@ -67,6 +68,7 @@ exports[`SnapUIAddress renders Bitcoin address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       128Lkh3...Mp8p6
     </p>
@@ -120,6 +122,7 @@ exports[`SnapUIAddress renders Cosmos address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       cosmos1...6hdc0
     </p>
@@ -141,6 +144,7 @@ exports[`SnapUIAddress renders Cosmos address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       cosmos1...6hdc0
     </p>
@@ -194,6 +198,7 @@ exports[`SnapUIAddress renders Ethereum address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0xab16a...Bfcdb
     </p>
@@ -215,6 +220,7 @@ exports[`SnapUIAddress renders Ethereum address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0xab16a...Bfcdb
     </p>
@@ -268,6 +274,7 @@ exports[`SnapUIAddress renders Hedera address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0.0.123...zbhlt
     </p>
@@ -289,6 +296,7 @@ exports[`SnapUIAddress renders Hedera address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0.0.123...zbhlt
     </p>
@@ -342,6 +350,7 @@ exports[`SnapUIAddress renders Polkadot address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       5hmuyxw...egmfy
     </p>
@@ -363,6 +372,7 @@ exports[`SnapUIAddress renders Polkadot address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       5hmuyxw...egmfy
     </p>
@@ -416,6 +426,7 @@ exports[`SnapUIAddress renders Starknet address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0x02dd1...0ab57
     </p>
@@ -437,6 +448,7 @@ exports[`SnapUIAddress renders Starknet address with blockie 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0x02dd1...0ab57
     </p>
@@ -490,6 +502,7 @@ exports[`SnapUIAddress renders legacy Ethereum address 1`] = `
     </div>
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+      style="line-break: anywhere;"
     >
       0xab16a...Bfcdb
     </p>
diff --git a/ui/components/app/snaps/snap-ui-address/snap-ui-address.tsx b/ui/components/app/snaps/snap-ui-address/snap-ui-address.tsx
index c75b172a616e..d39cb5adf321 100644
--- a/ui/components/app/snaps/snap-ui-address/snap-ui-address.tsx
+++ b/ui/components/app/snaps/snap-ui-address/snap-ui-address.tsx
@@ -9,6 +9,7 @@ import {
   AlignItems,
   Display,
   TextColor,
+  TextVariant,
 } from '../../../../helpers/constants/design-system';
 import { shortenAddress } from '../../../../helpers/utils/util';
 import { toChecksumHexAddress } from '../../../../../shared/modules/hexstring-utils';
@@ -20,11 +21,17 @@ export type SnapUIAddressProps = {
   address: string;
   // This is not currently exposed to Snaps.
   avatarSize?: 'xs' | 'sm' | 'md' | 'lg';
+  truncate?: boolean;
+  displayName?: boolean;
+  avatar?: boolean;
 };
 
 export const SnapUIAddress: React.FunctionComponent<SnapUIAddressProps> = ({
   address,
   avatarSize = 'md',
+  truncate = true,
+  displayName = false,
+  avatar = true,
 }) => {
   const caipIdentifier = useMemo(() => {
     if (isHexString(address)) {
@@ -41,15 +48,17 @@ export const SnapUIAddress: React.FunctionComponent<SnapUIAddressProps> = ({
     [caipIdentifier],
   );
 
-  const displayName = useDisplayName(parsed);
+  const name = useDisplayName(parsed);
 
-  const value =
-    displayName ??
-    shortenAddress(
-      parsed.chain.namespace === 'eip155'
-        ? toChecksumHexAddress(parsed.address)
-        : parsed.address,
-    );
+  // For EVM addresses, we make sure they are checksummed.
+  const transformedAddress =
+    parsed.chain.namespace === 'eip155'
+      ? toChecksumHexAddress(parsed.address)
+      : parsed.address;
+
+  const formattedAddress = truncate
+    ? shortenAddress(transformedAddress)
+    : address;
 
   return (
     <Box
@@ -58,8 +67,14 @@ export const SnapUIAddress: React.FunctionComponent<SnapUIAddressProps> = ({
       alignItems={AlignItems.center}
       gap={2}
     >
-      <SnapUIAvatar address={caipIdentifier} size={avatarSize} />
-      <Text color={TextColor.inherit}>{value}</Text>
+      {avatar && <SnapUIAvatar address={caipIdentifier} size={avatarSize} />}
+      <Text
+        variant={TextVariant.bodyMd}
+        color={TextColor.inherit}
+        style={{ lineBreak: 'anywhere' }}
+      >
+        {displayName && name ? name : formattedAddress}
+      </Text>
     </Box>
   );
 };
diff --git a/ui/components/app/snaps/snap-ui-renderer/components/address.ts b/ui/components/app/snaps/snap-ui-renderer/components/address.ts
index 1e39966df760..908890ecef9f 100644
--- a/ui/components/app/snaps/snap-ui-renderer/components/address.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/components/address.ts
@@ -6,5 +6,8 @@ export const address: UIComponentFactory<AddressElement> = ({ element }) => ({
   props: {
     address: element.props.address,
     avatarSize: 'xs',
+    truncate: element.props.truncate,
+    displayName: element.props.displayName,
+    avatar: element.props.avatar,
   },
 });
diff --git a/yarn.lock b/yarn.lock
index a1f4dfe4ea4c..9ac1b7409679 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4760,15 +4760,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^7.0.0, @metamask/approval-controller@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "@metamask/approval-controller@npm:7.0.2"
+"@metamask/approval-controller@npm:^7.0.0, @metamask/approval-controller@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "@metamask/approval-controller@npm:7.1.1"
   dependencies:
-    "@metamask/base-controller": "npm:^6.0.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/utils": "npm:^10.0.0"
     nanoid: "npm:^3.1.31"
-  checksum: 10/0ce1f607f11b5c8c9d6a462e89935388187f87d5627814882c8ce808b2e84bd727028f92708ac99c59c638578aadd5e91cb2799d8c8e4be497ee646f39821ea6
+  checksum: 10/10155e8c10be80a65bd99cc1aa83baf93900955aac35eb1cfc88c4ab8beff91de9db1168dd831b82378f26756e6f961296834d1703f9a727dd47402c735ee815
   languageName: node
   linkType: hard
 
@@ -5523,7 +5523,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^9.0.0, @metamask/json-rpc-engine@npm:^9.0.1, @metamask/json-rpc-engine@npm:^9.0.2":
+"@metamask/json-rpc-engine@npm:^9.0.0, @metamask/json-rpc-engine@npm:^9.0.2":
   version: 9.0.3
   resolution: "@metamask/json-rpc-engine@npm:9.0.3"
   dependencies:
@@ -5534,15 +5534,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.4":
-  version: 8.0.4
-  resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.4"
+"@metamask/json-rpc-middleware-stream@npm:^8.0.4, @metamask/json-rpc-middleware-stream@npm:^8.0.5":
+  version: 8.0.5
+  resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.5"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^10.0.0"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/safe-event-emitter": "npm:^3.0.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/utils": "npm:^10.0.0"
     readable-stream: "npm:^3.6.2"
-  checksum: 10/93c842e1ac8e624c65d888cb3539b38ade5b8415ea45f649d78dad91e7139f11fa96bbf89136998d21def7711b3f710939f8e4498ce31a6cf461892e3f4ba176
+  checksum: 10/486a4c64d445dc7ac7927ac5b9d01818ecef3fbb23d17eadada4748ed6cae9e259741e3c9380829b04a5c141d0972384647aedfde906dc83501b9d7f700ed621
   languageName: node
   linkType: hard
 
@@ -5831,22 +5831,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/permission-controller@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "@metamask/permission-controller@npm:11.0.0"
+"@metamask/permission-controller@npm:^11.0.0, @metamask/permission-controller@npm:^11.0.3":
+  version: 11.0.3
+  resolution: "@metamask/permission-controller@npm:11.0.3"
   dependencies:
-    "@metamask/base-controller": "npm:^6.0.2"
-    "@metamask/controller-utils": "npm:^11.0.2"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.1"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@types/deep-freeze-strict": "npm:^1.1.0"
     deep-freeze-strict: "npm:^1.1.1"
     immer: "npm:^9.0.6"
     nanoid: "npm:^3.1.31"
   peerDependencies:
     "@metamask/approval-controller": ^7.0.0
-  checksum: 10/3bd957b72ac4ed307566b650b5531e739732b9e6a414ec630bd43fc86c7c99b446eb5666f744abfb30c043824fe1b5a13681df8bd7c2244640b8996eec8e927a
+  checksum: 10/e90411ae34410176945e79c8e863ff2d78a12c01e98837a7298dc94d4815c65fec2cd338d4ae0026f91899acfe21bfe8b857a3b2f12c3d96719e5afb68df0e68
   languageName: node
   linkType: hard
 
@@ -6031,16 +6031,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/providers@npm:^17.1.2":
-  version: 17.2.0
-  resolution: "@metamask/providers@npm:17.2.0"
+"@metamask/providers@npm:^18.1.1":
+  version: 18.1.1
+  resolution: "@metamask/providers@npm:18.1.1"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^9.0.1"
-    "@metamask/json-rpc-middleware-stream": "npm:^8.0.1"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^8.0.5"
     "@metamask/object-multiplex": "npm:^2.0.0"
-    "@metamask/rpc-errors": "npm:^6.3.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
-    "@metamask/utils": "npm:^9.0.0"
+    "@metamask/utils": "npm:^10.0.0"
     detect-browser: "npm:^5.2.0"
     extension-port-stream: "npm:^4.1.0"
     fast-deep-equal: "npm:^3.1.3"
@@ -6048,7 +6048,7 @@ __metadata:
     readable-stream: "npm:^3.6.2"
   peerDependencies:
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/b2fc93cdc059528bfeb14a61d6153f9a5f2679e5c6640648c16cd4e5067f758a67c2c6abab962615e878e6b9d7f1bbcd3632584ad7e57ec9df8c16f47b13e608
+  checksum: 10/dca428d84e490343d85921d4fb09216a0b64be59a036d7b4f7b5ca4e2581c29a4106d58ff9dfe0650dc2b9387dd2adad508fc61073a9fda8ebde8ee3a5137abe
   languageName: node
   linkType: hard
 
@@ -6189,24 +6189,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.11.1":
-  version: 9.11.1
-  resolution: "@metamask/snaps-controllers@npm:9.11.1"
+"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.12.0":
+  version: 9.12.0
+  resolution: "@metamask/snaps-controllers@npm:9.12.0"
   dependencies:
-    "@metamask/approval-controller": "npm:^7.0.2"
-    "@metamask/base-controller": "npm:^6.0.2"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/json-rpc-middleware-stream": "npm:^8.0.2"
+    "@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/object-multiplex": "npm:^2.0.0"
-    "@metamask/permission-controller": "npm:^11.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:^6.3.1"
-    "@metamask/snaps-registry": "npm:^3.2.1"
-    "@metamask/snaps-rpc-methods": "npm:^11.5.0"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-registry": "npm:^3.2.2"
+    "@metamask/snaps-rpc-methods": "npm:^11.5.1"
+    "@metamask/snaps-sdk": "npm:^6.10.0"
+    "@metamask/snaps-utils": "npm:^8.5.0"
+    "@metamask/utils": "npm:^10.0.0"
     "@xstate/fsm": "npm:^2.0.0"
     browserify-zlib: "npm:^0.2.0"
     concat-stream: "npm:^2.0.0"
@@ -6216,73 +6216,74 @@ __metadata:
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
     readable-web-to-node-stream: "npm:^3.0.2"
+    semver: "npm:^7.5.4"
     tar-stream: "npm:^3.1.7"
   peerDependencies:
-    "@metamask/snaps-execution-environments": ^6.9.1
+    "@metamask/snaps-execution-environments": ^6.9.2
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 10/e9d47b62c39cf331d26a9e35dcf5c0452aff70980db31b42b56b11165d8d1dc7e3b5ad6b495644baa0276b18a7d9681bfb059388c4f2fb1b07c6bbc8b8da799b
+  checksum: 10/8d411ff2cfd43e62fe780092e935a1d977379488407b56cca1390edfa9408871cbaf3599f6e6ee999340d46fd3650f225a3270ceec9492c6f2dc4d93538c25ae
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^6.9.1":
-  version: 6.9.1
-  resolution: "@metamask/snaps-execution-environments@npm:6.9.1"
+"@metamask/snaps-execution-environments@npm:^6.9.2":
+  version: 6.9.2
+  resolution: "@metamask/snaps-execution-environments@npm:6.9.2"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/post-message-stream": "npm:^8.1.1"
-    "@metamask/providers": "npm:^17.1.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/snaps-sdk": "npm:^6.8.0"
-    "@metamask/snaps-utils": "npm:^8.4.0"
+    "@metamask/providers": "npm:^18.1.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^6.10.0"
+    "@metamask/snaps-utils": "npm:^8.5.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
-  checksum: 10/87fb63e89780ebeb9083c93988167e671ceb3d1c77980a2cd32801f83d285669859bfd248197d3a2d683119b87554f1f835965549ad04587c8c2fa2f01fa1f18
+  checksum: 10/f81dd3728417dc63ed16b102504cdf6c815bffef7b1dad9e7b0e064618b008e1f0fe6d05c225bcafeee09fb4bc473599ee710e1a26a6f3604e965f656fce8e36
   languageName: node
   linkType: hard
 
-"@metamask/snaps-registry@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@metamask/snaps-registry@npm:3.2.1"
+"@metamask/snaps-registry@npm:^3.2.1, @metamask/snaps-registry@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "@metamask/snaps-registry@npm:3.2.2"
   dependencies:
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.0.0"
+    "@metamask/utils": "npm:^10.0.0"
     "@noble/curves": "npm:^1.2.0"
     "@noble/hashes": "npm:^1.3.2"
-  checksum: 10/b2a413f27db9b5701d3773017035ee1e153734a25363e3877f44be4a70f51c48d77ad0ac8f1e96a7d732d2079a4b259896f361b3cba1ae0bf0bbc1075406f178
+  checksum: 10/ca8239e838bbb913435e166136bbc9bd7222c4bd87b1525fa7ae3cdf2e0b868b5d4d90a67d1ed49633d566bdef9243abdbf5f5937b85a85d24184087f555813e
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^11.5.0":
-  version: 11.5.0
-  resolution: "@metamask/snaps-rpc-methods@npm:11.5.0"
+"@metamask/snaps-rpc-methods@npm:^11.5.1":
+  version: 11.5.1
+  resolution: "@metamask/snaps-rpc-methods@npm:11.5.1"
   dependencies:
     "@metamask/key-tree": "npm:^9.1.2"
-    "@metamask/permission-controller": "npm:^11.0.0"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
+    "@metamask/permission-controller": "npm:^11.0.3"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/snaps-sdk": "npm:^6.10.0"
+    "@metamask/snaps-utils": "npm:^8.5.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@noble/hashes": "npm:^1.3.1"
-  checksum: 10/a89b79926d5204a70369cd70e5174290805e8f9ede8057a49e347bd0e680d88de40ddfc25b3e54f53a16c3080a736ab73b50ffe50623264564af13f8709a23d3
+  checksum: 10/0f999a5dd64f1b1123366f448ae833f0e95a415791600bb535959ba67d2269fbe3c4504d47f04db71bafa79a9a87d6b832fb2e2b5ef29567078c95bce2638f35
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^6.9.0":
-  version: 6.9.0
-  resolution: "@metamask/snaps-sdk@npm:6.9.0"
+"@metamask/snaps-sdk@npm:^6.10.0":
+  version: 6.10.0
+  resolution: "@metamask/snaps-sdk@npm:6.10.0"
   dependencies:
     "@metamask/key-tree": "npm:^9.1.2"
-    "@metamask/providers": "npm:^17.1.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
+    "@metamask/providers": "npm:^18.1.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
-  checksum: 10/ea2c34c4451f671acc6c3c0ad0d46e770e8b7d0741c1d78a30bc36b883f09a10e9a428b8b564ecd0171da95fdf78bb8ac0de261423a1b35de5d22852300a24ee
+    "@metamask/utils": "npm:^10.0.0"
+  checksum: 10/02f04536328a64ff1e9e48fb6b109698d6d83f42af5666a9758ccb1e7a1e67c0c2e296ef2fef419dd3d1c8f26bbf30b9f31911a1baa66f044f21cd0ecb7a11a7
   languageName: node
   linkType: hard
 
@@ -6317,21 +6318,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^8.1.1, @metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.4.0, @metamask/snaps-utils@npm:^8.4.1":
-  version: 8.4.1
-  resolution: "@metamask/snaps-utils@npm:8.4.1"
+"@metamask/snaps-utils@npm:^8.1.1, @metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.5.0, @metamask/snaps-utils@npm:^8.5.1":
+  version: 8.5.1
+  resolution: "@metamask/snaps-utils@npm:8.5.1"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
-    "@metamask/base-controller": "npm:^6.0.2"
+    "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/key-tree": "npm:^9.1.2"
-    "@metamask/permission-controller": "npm:^11.0.0"
-    "@metamask/rpc-errors": "npm:^6.3.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.1"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
+    "@metamask/snaps-registry": "npm:^3.2.2"
+    "@metamask/snaps-sdk": "npm:^6.10.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@noble/hashes": "npm:^1.3.1"
     "@scure/base": "npm:^1.1.1"
     chalk: "npm:^4.1.2"
@@ -6344,7 +6345,7 @@ __metadata:
     semver: "npm:^7.5.4"
     ses: "npm:^1.1.0"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/c68a2fe69dc835c2b996d621fd4698435475d419a85aa557aa000aae0ab7ebb68d2a52f0b28bbab94fff895ece9a94077e3910a21b16d904cff3b9419ca575b6
+  checksum: 10/38c8098c7dfa82bf907d31f77e2d5ffe6a82dca9bf5d633d10ac024f153d94b8124d7ddfb2e3e35befb7af619ebff1900e81476f889011eebdd80b5e12328c30
   languageName: node
   linkType: hard
 
@@ -26463,11 +26464,11 @@ __metadata:
     "@metamask/selected-network-controller": "npm:^18.0.2"
     "@metamask/signature-controller": "npm:^21.0.0"
     "@metamask/smart-transactions-controller": "npm:^13.0.0"
-    "@metamask/snaps-controllers": "npm:^9.11.1"
-    "@metamask/snaps-execution-environments": "npm:^6.9.1"
-    "@metamask/snaps-rpc-methods": "npm:^11.5.0"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    "@metamask/snaps-utils": "npm:^8.4.1"
+    "@metamask/snaps-controllers": "npm:^9.12.0"
+    "@metamask/snaps-execution-environments": "npm:^6.9.2"
+    "@metamask/snaps-rpc-methods": "npm:^11.5.1"
+    "@metamask/snaps-sdk": "npm:^6.10.0"
+    "@metamask/snaps-utils": "npm:^8.5.1"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.7.0"
     "@metamask/transaction-controller": "npm:^38.1.0"

From d970c2591823e54d821725fd5d0912f1bf3231b0 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:50:20 -0800
Subject: [PATCH 028/111] chore: Add gravity logo and image mappings (#28306)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds Gravity logo and chain mappings. Internal PR of
https://github.com/MetaMask/metamask-extension/pull/27747 that wasn't
passing CI for some reason.

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

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/pull/27747

## **Manual testing steps**

## **Screenshots/Recordings**

<img width="356" alt="Screenshot 2024-11-05 at 12 49 17 PM"
src="https://github.com/user-attachments/assets/bd003382-a36e-4fef-b18c-f33441a8e059">

## **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/images/gravity.svg      | 10 ++++++++++
 shared/constants/network.ts | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 app/images/gravity.svg

diff --git a/app/images/gravity.svg b/app/images/gravity.svg
new file mode 100644
index 000000000000..a94d44f8d285
--- /dev/null
+++ b/app/images/gravity.svg
@@ -0,0 +1,10 @@
+<svg width="1096" height="1096" viewBox="0 0 1096 1096" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1096" height="1096" fill="url(#paint0_linear_2386_29779)"/>
+<path d="M932.341 327.012C926.783 317.407 914.396 314.244 904.912 320.01L395.528 629.384C382.547 605.134 375.191 577.424 375.191 548C375.191 452.465 452.729 375.019 548.378 375.019C589.448 375.019 627.153 389.335 656.842 413.19L548.477 487.49L830.095 325.084C836.165 321.592 838.243 313.832 834.73 307.786C831.035 301.394 822.673 299.5 816.57 303.684L747.609 350.966C696.791 299.697 626.312 267.935 548.378 267.935C393.516 267.935 267.98 393.322 267.98 548C267.98 597.803 281.01 644.557 303.821 685.084L161 771.822L307.632 691.641C356.602 773.355 446.082 828.066 548.378 828.066C703.24 828.066 828.776 702.679 828.776 548C828.776 539.269 828.776 540.758 828.776 514.557C828.776 488.357 839.421 454.836 877.136 434.656C880.369 432.926 881.54 428.874 879.709 425.694C877.911 422.597 873.953 421.526 870.852 423.322L536.469 616.155C573.795 600.307 602.328 590.67 640.151 583.08C718.94 567.272 720.945 604.789 690.518 647.107C670.144 675.442 624.118 720.949 548.411 720.949C486.674 720.949 432.508 688.692 401.829 640.126L924.705 354.244C934.453 348.923 937.9 336.617 932.341 327.012Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_2386_29779" x1="109.451" y1="1096" x2="807.019" y2="-1.28109e-05" gradientUnits="userSpaceOnUse">
+<stop offset="0.0230088" stop-color="#E57536"/>
+<stop offset="0.604747"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 64d330b73b2c..4844e7c2e981 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -153,6 +153,8 @@ export const CHAIN_IDS = {
   ARBITRUM_SEPOLIA: '0x66eee',
   NEAR: '0x18d',
   NEAR_TESTNET: '0x18e',
+  GRAVITY_ALPHA_MAINNET: '0x659',
+  GRAVITY_ALPHA_TESTNET_SEPOLIA: '0x34c1',
 } as const;
 
 export const CHAINLIST_CHAIN_IDS_MAP = {
@@ -209,6 +211,8 @@ export const CHAINLIST_CHAIN_IDS_MAP = {
   FILECOIN: '0x13a',
   NUMBERS: '0x290b',
   APE: '0x8173',
+  GRAVITY_ALPHA_MAINNET: '0x659',
+  GRAVITY_ALPHA_TESTNET_SEPOLIA: '0x34c1',
 } as const;
 
 // To add a deprecation warning to a network, add it to the array
@@ -454,6 +458,8 @@ 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 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';
 
 export const INFURA_PROVIDER_TYPES = [
   NETWORK_TYPES.MAINNET,
@@ -792,6 +798,10 @@ 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.GRAVITY_ALPHA_MAINNET]:
+    GRAVITY_ALPHA_MAINNET_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.GRAVITY_ALPHA_TESTNET_SEPOLIA]:
+    GRAVITY_ALPHA_TESTNET_SEPOLIA_IMAGE_URL,
 } as const;
 
 export const CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP = {
@@ -824,6 +834,9 @@ export const CHAIN_ID_TOKEN_IMAGE_MAP = {
   [CHAIN_IDS.MOONBEAM]: MOONBEAM_TOKEN_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.IOTEX_MAINNET]: IOTEX_TOKEN_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]:
+    GRAVITY_ALPHA_TESTNET_SEPOLIA_IMAGE_URL,
 } as const;
 
 export const INFURA_BLOCKED_KEY = 'countryBlocked';

From 63fb3ac6fc30a20cdc112585839e81d013826768 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Wed, 6 Nov 2024 08:12:57 +0000
Subject: [PATCH 029/111] fix: remove scroll-to-bottom requirement in
 redesigned transaction confirmations (#27910)
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 the removal of the scroll-to-bottom requirement in the
redesigned transaction confirmation screens. It eliminates the need for
users to scroll to the bottom in order to enable the confirm button,
streamlining the confirmation process. The scroll-to-bottom arrow is
also removed, ensuring a smoother user experience without unnecessary
interaction barriers.

<!--
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/27910?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Go to test dapp
2. Have 2+ transaction insights snaps installed
3. Click Create Token
4. See the confirm button disabled until you scroll to bottom

## **Screenshots/Recordings**


[deploy.webm](https://github.com/user-attachments/assets/79716a68-e70f-456a-b962-ccec8732935b)


<!-- 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.
---
 .../scroll-to-bottom/scroll-to-bottom.test.tsx | 15 ++++++++++++++-
 .../scroll-to-bottom/scroll-to-bottom.tsx      | 18 ++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
index d5954e56609b..6bf31166b6e5 100644
--- a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
+++ b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.test.tsx
@@ -2,7 +2,10 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 
 import { unapprovedTypedSignMsgV4 } from '../../../../../../test/data/confirmations/typed_sign';
-import { getMockPersonalSignConfirmState } from '../../../../../../test/data/confirmations/helper';
+import {
+  getMockContractInteractionConfirmState,
+  getMockPersonalSignConfirmState,
+} from '../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
 import * as usePreviousHooks from '../../../../../hooks/usePrevious';
 import ScrollToBottom from './scroll-to-bottom';
@@ -116,6 +119,16 @@ describe('ScrollToBottom', () => {
       expect(mockSetHasScrolledToBottom).toHaveBeenCalledWith(false);
     });
 
+    it('does not render the scroll button when the confirmation is transaction redesigned', () => {
+      const mockStateTransaction = getMockContractInteractionConfirmState();
+      const { container } = renderWithConfirmContextProvider(
+        <ScrollToBottom>foobar</ScrollToBottom>,
+        configureMockStore([])(mockStateTransaction),
+      );
+
+      expect(container.querySelector(buttonSelector)).not.toBeInTheDocument();
+    });
+
     describe('when user has scrolled to the bottom', () => {
       beforeEach(() => {
         mockedUseScrollRequiredResult.isScrolledToBottom = true;
diff --git a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
index f42997de114e..c61053818923 100644
--- a/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
+++ b/ui/pages/confirmations/components/confirm/scroll-to-bottom/scroll-to-bottom.tsx
@@ -1,5 +1,6 @@
 import React, { useContext, useEffect } from 'react';
 import { useSelector } from 'react-redux';
+import { TransactionType } from '@metamask/transaction-controller';
 import {
   Box,
   ButtonIcon,
@@ -20,6 +21,7 @@ import { usePrevious } from '../../../../../hooks/usePrevious';
 import { useScrollRequired } from '../../../../../hooks/useScrollRequired';
 import { useConfirmContext } from '../../../context/confirm';
 import { selectConfirmationAdvancedDetailsOpen } from '../../../selectors/preferences';
+import { REDESIGN_DEV_TRANSACTION_TYPES } from '../../../utils';
 
 type ContentProps = {
   /**
@@ -49,6 +51,13 @@ const ScrollToBottom = ({ children }: ContentProps) => {
     offsetPxFromBottom: 0,
   });
 
+  const isTransactionRedesign = REDESIGN_DEV_TRANSACTION_TYPES.includes(
+    currentConfirmation?.type as TransactionType,
+  );
+
+  const showScrollToBottom =
+    isScrollable && !isScrolledToBottom && !isTransactionRedesign;
+
   /**
    * Scroll to the top of the page when the confirmation changes. This happens
    * when we navigate through different confirmations. Also, resets hasScrolledToBottom
@@ -71,8 +80,13 @@ const ScrollToBottom = ({ children }: ContentProps) => {
   }, [currentConfirmation?.id, previousId, ref?.current]);
 
   useEffect(() => {
+    if (isTransactionRedesign) {
+      setIsScrollToBottomCompleted(true);
+      return;
+    }
+
     setIsScrollToBottomCompleted(!isScrollable || hasScrolledToBottom);
-  }, [isScrollable, hasScrolledToBottom]);
+  }, [isScrollable, hasScrolledToBottom, isTransactionRedesign]);
 
   return (
     <Box
@@ -104,7 +118,7 @@ const ScrollToBottom = ({ children }: ContentProps) => {
       >
         {children}
 
-        {isScrollable && !isScrolledToBottom && (
+        {showScrollToBottom && (
           <ButtonIcon
             className="confirm-scroll-to-bottom__button"
             onClick={scrollToBottom}

From 3da34f448c9777722799d15389bdc0c83dfd28f9 Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Wed, 6 Nov 2024 17:23:06 +0800
Subject: [PATCH 030/111] feat: btc e2e tests (#27986)
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 e2e tests for the btc send flow.

## **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/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: Charly Chevalier <charly.chevalier@consensys.net>
---
 test/e2e/constants.ts                         |  13 ++
 test/e2e/flask/btc/btc-send.spec.ts           | 153 +++++++++++++++++
 test/e2e/flask/btc/common-btc.ts              | 158 +++++++++++++++++-
 .../app/wallet-overview/coin-buttons.tsx      |  26 ++-
 4 files changed, 337 insertions(+), 13 deletions(-)
 create mode 100644 test/e2e/flask/btc/btc-send.spec.ts

diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index 8bf39d261bcb..2e24bf4042ba 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -50,3 +50,16 @@ export const DEFAULT_BTC_ACCOUNT = 'bc1qg6whd6pc0cguh6gpp3ewujm53hv32ta9hdp252';
 
 /* Default (mocked) BTC balance used by the Bitcoin RPC provider */
 export const DEFAULT_BTC_BALANCE = 1; // BTC
+
+/* Default BTC fees rate */
+export const DEFAULT_BTC_FEES_RATE = 0.00001; // BTC
+
+/* Default BTC conversion rate to USD */
+export const DEFAULT_BTC_CONVERSION_RATE = 62000; // USD
+
+/* Default BTC transaction ID */
+export const DEFAULT_BTC_TRANSACTION_ID =
+  'e4111a707317da67d49a71af4cbcf6c0546f900ca32c3842d2254e315d1fca18';
+
+/* Number of sats in 1 BTC */
+export const SATS_IN_1_BTC = 100000000; // sats
diff --git a/test/e2e/flask/btc/btc-send.spec.ts b/test/e2e/flask/btc/btc-send.spec.ts
new file mode 100644
index 000000000000..c1a956cd00b7
--- /dev/null
+++ b/test/e2e/flask/btc/btc-send.spec.ts
@@ -0,0 +1,153 @@
+import { strict as assert } from 'assert';
+import { Suite } from 'mocha';
+import { Driver } from '../../webdriver/driver';
+import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
+import {
+  getTransactionRequest,
+  SendFlowPlaceHolders,
+  withBtcAccountSnap,
+} from './common-btc';
+
+export async function startSendFlow(driver: Driver, recipient?: string) {
+  // Wait a bit so the MultichainRatesController is able to fetch BTC -> USD rates.
+  await driver.delay(1000);
+
+  // Start the send flow.
+  const sendButton = await driver.waitForSelector({
+    text: 'Send',
+    tag: 'button',
+    css: '[data-testid="coin-overview-send"]',
+  });
+  await sendButton.click();
+
+  // See the review button is disabled by default.
+  await driver.waitForSelector({
+    text: 'Review',
+    tag: 'button',
+    css: '[disabled]',
+  });
+
+  if (recipient) {
+    // Set the recipient address (if any).
+    await driver.pasteIntoField(
+      `input[placeholder="${SendFlowPlaceHolders.RECIPIENT}"]`,
+      recipient,
+    );
+  }
+}
+
+describe('BTC Account - Send', function (this: Suite) {
+  it('can send complete the send flow', async function () {
+    await withBtcAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver, mockServer) => {
+        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
+
+        // Set the amount to send.
+        const mockAmountToSend = '0.5';
+        await driver.pasteIntoField(
+          `input[placeholder="${SendFlowPlaceHolders.AMOUNT}"]`,
+          mockAmountToSend,
+        );
+
+        // From here, the "summary panel" should have some information about the fees and total.
+        await driver.waitForSelector({
+          text: 'Total',
+          tag: 'p',
+        });
+
+        // The review button will become available.
+        const snapReviewButton = await driver.findClickableElement({
+          text: 'Review',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapReviewButton.isEnabled(), true);
+        await snapReviewButton.click();
+
+        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
+        // We already have unit tests for these calculations on the Snap.
+
+        // ------------------------------------------------------------------------------
+        // From here, we have moved to the confirmation screen (second part of the flow).
+
+        // We should be able to send the transaction right away.
+        const snapSendButton = await driver.waitForSelector({
+          text: 'Send',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapSendButton.isEnabled(), true);
+        await snapSendButton.click();
+
+        // Check that we are selecting the "Activity tab" right after the send.
+        await driver.waitForSelector({
+          tag: 'div',
+          text: 'Bitcoin activity is not supported',
+        });
+
+        const transaction = await getTransactionRequest(mockServer);
+        assert(transaction !== undefined);
+      },
+    );
+  });
+
+  it('can send the max amount', async function () {
+    await withBtcAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver, mockServer) => {
+        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
+
+        // Use the max spendable amount of that account.
+        await driver.clickElement({
+          text: 'Max',
+          tag: 'button',
+        });
+
+        // From here, the "summary panel" should have some information about the fees and total.
+        await driver.waitForSelector({
+          text: 'Total',
+          tag: 'p',
+        });
+
+        await driver.waitForSelector({
+          text: `${DEFAULT_BTC_BALANCE} BTC`,
+          tag: 'p',
+        });
+
+        // The review button will become available.
+        const snapReviewButton = await driver.findClickableElement({
+          text: 'Review',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapReviewButton.isEnabled(), true);
+        await snapReviewButton.click();
+
+        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
+        // We already have unit tests for these calculations on the snap.
+
+        // ------------------------------------------------------------------------------
+        // From here, we have moved to the confirmation screen (second part of the flow).
+
+        // We should be able to send the transaction right away.
+        const snapSendButton = await driver.waitForSelector({
+          text: 'Send',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapSendButton.isEnabled(), true);
+        await snapSendButton.click();
+
+        // Check that we are selecting the "Activity tab" right after the send.
+        await driver.waitForSelector({
+          tag: 'div',
+          text: 'Bitcoin activity is not supported',
+        });
+
+        const transaction = await getTransactionRequest(mockServer);
+        assert(transaction !== undefined);
+      },
+    );
+  });
+});
diff --git a/test/e2e/flask/btc/common-btc.ts b/test/e2e/flask/btc/common-btc.ts
index 6891b3bfd60e..452f9ad44f6b 100644
--- a/test/e2e/flask/btc/common-btc.ts
+++ b/test/e2e/flask/btc/common-btc.ts
@@ -1,11 +1,26 @@
 import { Mockttp } from 'mockttp';
 import FixtureBuilder from '../../fixture-builder';
 import { withFixtures, unlockWallet } from '../../helpers';
-import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
+import {
+  DEFAULT_BTC_ACCOUNT,
+  DEFAULT_BTC_BALANCE,
+  DEFAULT_BTC_FEES_RATE,
+  DEFAULT_BTC_TRANSACTION_ID,
+  DEFAULT_BTC_CONVERSION_RATE,
+  SATS_IN_1_BTC,
+} from '../../constants';
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
 import { Driver } from '../../webdriver/driver';
 import messages from '../../../../app/_locales/en/messages.json';
 
+const QUICKNODE_URL_REGEX = /^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u;
+
+export enum SendFlowPlaceHolders {
+  AMOUNT = 'Enter amount to send',
+  RECIPIENT = 'Enter receiving address',
+  LOADING = 'Preparing transaction',
+}
+
 export async function createBtcAccount(driver: Driver) {
   await driver.clickElement('[data-testid="account-menu-icon"]');
   await driver.clickElement(
@@ -27,12 +42,17 @@ export async function createBtcAccount(driver: Driver) {
   );
 }
 
+export function btcToSats(btc: number): number {
+  // Watchout, we're not using BigNumber(s) here (but that's ok for test purposes)
+  return btc * SATS_IN_1_BTC;
+}
+
 export async function mockBtcBalanceQuote(
   mockServer: Mockttp,
   address: string = DEFAULT_BTC_ACCOUNT,
 ) {
   return await mockServer
-    .forPost(/^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u)
+    .forPost(QUICKNODE_URL_REGEX)
     .withJsonBodyIncluding({
       method: 'bb_getaddress',
     })
@@ -42,7 +62,7 @@ export async function mockBtcBalanceQuote(
         json: {
           result: {
             address,
-            balance: (DEFAULT_BTC_BALANCE * 1e8).toString(), // Converts from BTC to sats
+            balance: btcToSats(DEFAULT_BTC_BALANCE).toString(), // Converts from BTC to sats
             totalReceived: '0',
             totalSent: '0',
             unconfirmedBalance: '0',
@@ -54,6 +74,105 @@ export async function mockBtcBalanceQuote(
     });
 }
 
+export async function mockBtcFeeCallQuote(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'estimatesmartfee',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: {
+            blocks: 1,
+            feerate: DEFAULT_BTC_FEES_RATE, // sats
+          },
+        },
+      };
+    });
+}
+
+export async function mockMempoolInfo(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'getmempoolinfo',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: {
+            loaded: true,
+            size: 165194,
+            bytes: 93042828,
+            usage: 550175264,
+            total_fee: 1.60127931,
+            maxmempool: 2048000000,
+            mempoolminfee: DEFAULT_BTC_FEES_RATE,
+            minrelaytxfee: DEFAULT_BTC_FEES_RATE,
+            incrementalrelayfee: 0.00001,
+            unbroadcastcount: 0,
+            fullrbf: true,
+          },
+        },
+      };
+    });
+}
+
+export async function mockGetUTXO(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'bb_getutxos',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: [
+            {
+              txid: DEFAULT_BTC_TRANSACTION_ID,
+              vout: 0,
+              value: btcToSats(DEFAULT_BTC_BALANCE).toString(),
+              height: 101100110,
+              confirmations: 6,
+            },
+          ],
+        },
+      };
+    });
+}
+
+export async function mockSendTransaction(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'sendrawtransaction',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: DEFAULT_BTC_TRANSACTION_ID,
+        },
+      };
+    });
+}
+
+export async function mockRatesCall(mockServer: Mockttp) {
+  return await mockServer
+    .forGet('https://min-api.cryptocompare.com/data/pricemulti')
+    .withQuery({ fsyms: 'btc', tsyms: 'usd,USD' })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: { BTC: { USD: DEFAULT_BTC_CONVERSION_RATE } },
+      };
+    });
+}
+
 export async function mockRampsDynamicFeatureFlag(
   mockServer: Mockttp,
   subDomain: string,
@@ -87,7 +206,7 @@ export async function withBtcAccountSnap(
     title,
     bitcoinSupportEnabled,
   }: { title?: string; bitcoinSupportEnabled?: boolean },
-  test: (driver: Driver) => Promise<void>,
+  test: (driver: Driver, mockServer: Mockttp) => Promise<void>,
 ) {
   await withFixtures(
     {
@@ -99,17 +218,44 @@ export async function withBtcAccountSnap(
       title,
       dapp: true,
       testSpecificMock: async (mockServer: Mockttp) => [
+        await mockRatesCall(mockServer),
         await mockBtcBalanceQuote(mockServer),
         // See: PROD_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'api'),
         // See: UAT_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'uat-api'),
+        await mockMempoolInfo(mockServer),
+        await mockBtcFeeCallQuote(mockServer),
+        await mockGetUTXO(mockServer),
+        await mockSendTransaction(mockServer),
       ],
     },
-    async ({ driver }: { driver: Driver }) => {
+    async ({ driver, mockServer }: { driver: Driver; mockServer: Mockttp }) => {
       await unlockWallet(driver);
       await createBtcAccount(driver);
-      await test(driver);
+      await test(driver, mockServer);
+    },
+  );
+}
+
+export async function getQuickNodeSeenRequests(mockServer: Mockttp) {
+  const seenRequests = await Promise.all(
+    (
+      await mockServer.getMockedEndpoints()
+    ).map((mockedEndpoint) => mockedEndpoint.getSeenRequests()),
+  );
+  return seenRequests
+    .flat()
+    .filter((request) => request.url.match(QUICKNODE_URL_REGEX));
+}
+
+export async function getTransactionRequest(mockServer: Mockttp) {
+  // Check that the transaction has been sent.
+  const transactionRequest = (await getQuickNodeSeenRequests(mockServer)).find(
+    async (request) => {
+      const body = (await request.body.getJson()) as { method: string };
+      return body.method === 'sendrawtransaction';
     },
   );
+  return transactionRequest;
 }
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index bac7872c79e3..f49d7bf31801 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -125,6 +125,12 @@ const CoinButtons = ({
   const account = useSelector(getSelectedAccount);
   const { address: selectedAddress } = account;
   const history = useHistory();
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  const currentActivityTabName = useSelector(
+    // @ts-expect-error TODO: fix state type
+    (state) => state.metamask.defaultHomeActiveTabName,
+  );
+  ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const location = useLocation();
   const keyring = useSelector(getCurrentKeyring);
@@ -279,14 +285,20 @@ const CoinButtons = ({
     switch (account.type) {
       ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
       case BtcAccountType.P2wpkh: {
-        await sendMultichainTransaction(
-          BITCOIN_WALLET_SNAP_ID,
-          account.id,
-          chainId as CaipChainId,
-        );
+        try {
+          // FIXME: We switch the tab before starting the send flow (we
+          // faced some inconsistencies when changing it after).
+          await dispatch(setDefaultHomeActiveTabName('activity'));
+          await sendMultichainTransaction(
+            BITCOIN_WALLET_SNAP_ID,
+            account.id,
+            chainId as CaipChainId,
+          );
+        } catch {
+          // Restore the previous tab in case of any error (see FIXME comment above).
+          await dispatch(setDefaultHomeActiveTabName(currentActivityTabName));
+        }
 
-        // We automatically switch to the activity tab once the transaction has been sent.
-        dispatch(setDefaultHomeActiveTabName('activity'));
         break;
       }
       ///: END:ONLY_INCLUDE_IF

From 4dd5413eceba9c32e01b2fb9fb9b73a2e4b2ab4c Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:29:11 +0100
Subject: [PATCH 031/111] test: [POM] Refactor e2e tests to use onboarding
 flows defined in Page Object Models (#28202)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Refactor e2e tests to use onboarding flows defined in Page Object
Models, as the new onboarding functions are more stable, and have
removed unnecessary delays
- Deprecate old onboarding functions
- Correct the logic in test
`test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts`
to make it more clear, we only need to toggle the basic functionality
off during onboarding, it will also toggle off sync account option.
- Removed ganache server in e2e tests when the ganache is not necessary

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

## **Related issues**

Fixes: #28226

## **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: Danica Shen <zhaodanica@gmail.com>
---
 test/e2e/helpers.js                           | 39 ++++++--
 .../e2e/page-objects/flows/onboarding.flow.ts | 75 +++++++++++++---
 .../onboarding/onboarding-password-page.ts    | 16 ++--
 .../pages/onboarding/onboarding-srp-page.ts   |  6 +-
 test/e2e/tests/network/multi-rpc.spec.ts      |  8 +-
 .../importing-private-key-account.spec.ts     | 34 +++----
 .../account-syncing/new-user-sync.spec.ts     | 32 +++----
 .../onboarding-with-opt-out.spec.ts           | 88 +++++++++++--------
 .../sync-after-adding-account.spec.ts         | 60 +++++++------
 .../sync-after-modifying-account-name.spec.ts | 34 +++----
 .../sync-after-onboarding.spec.ts             | 21 +++--
 test/e2e/tests/onboarding/onboarding.spec.ts  | 10 ++-
 .../onboarding-infura-call-privacy.spec.ts    |  2 +-
 13 files changed, 258 insertions(+), 167 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 5eaf14b8360b..1cb9e47f1f80 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -382,6 +382,12 @@ const getWindowHandles = async (driver, handlesCount) => {
   return { extension, dapp, popup };
 };
 
+/**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
+ * @param driver
+ * @param seedPhrase
+ * @param password
+ */
 const importSRPOnboardingFlow = async (driver, seedPhrase, password) => {
   // agree to terms of use
   await driver.clickElement('[data-testid="onboarding-terms-checkbox"]');
@@ -408,6 +414,12 @@ const importSRPOnboardingFlow = async (driver, seedPhrase, password) => {
   await driver.assertElementNotPresent('.loading-overlay');
 };
 
+/**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
+ * @param driver
+ * @param seedPhrase
+ * @param password
+ */
 const completeImportSRPOnboardingFlow = async (
   driver,
   seedPhrase,
@@ -423,6 +435,12 @@ const completeImportSRPOnboardingFlow = async (
   await driver.clickElement('[data-testid="pin-extension-done"]');
 };
 
+/**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
+ * @param driver
+ * @param seedPhrase
+ * @param password
+ */
 const completeImportSRPOnboardingFlowWordByWord = async (
   driver,
   seedPhrase,
@@ -466,8 +484,8 @@ const completeImportSRPOnboardingFlowWordByWord = async (
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Begin the create new wallet flow on onboarding screen.
- *
  * @param {WebDriver} driver
  */
 const onboardingBeginCreateNewWallet = async (driver) => {
@@ -479,8 +497,8 @@ const onboardingBeginCreateNewWallet = async (driver) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Choose either "I Agree" or "No Thanks" on the MetaMetrics onboarding screen
- *
  * @param {WebDriver} driver
  * @param {boolean} option - true to opt into metrics, default is false
  */
@@ -491,8 +509,8 @@ const onboardingChooseMetametricsOption = async (driver, option = false) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Set a password for MetaMask during onboarding
- *
  * @param {WebDriver} driver
  * @param {string} password - Password to set
  */
@@ -505,9 +523,9 @@ const onboardingCreatePassword = async (driver, password) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Choose to secure wallet, and then get recovery phrase and confirm the SRP
  * during onboarding flow.
- *
  * @param {WebDriver} driver
  */
 const onboardingRevealAndConfirmSRP = async (driver) => {
@@ -543,9 +561,9 @@ const onboardingRevealAndConfirmSRP = async (driver) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Complete the onboarding flow by confirming completion. Final step before the
  * reminder to pin the extension.
- *
  * @param {WebDriver} driver
  */
 const onboardingCompleteWalletCreation = async (driver) => {
@@ -555,8 +573,8 @@ const onboardingCompleteWalletCreation = async (driver) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Move through the steps of pinning extension after successful onboarding
- *
  * @param {WebDriver} driver
  */
 const onboardingPinExtension = async (driver) => {
@@ -566,12 +584,12 @@ const onboardingPinExtension = async (driver) => {
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Completes the onboarding flow with optional opt-out settings for wallet creation.
  *
  * This function navigates through the onboarding process, allowing for opt-out of certain features.
  * It waits for the appropriate heading to appear, then proceeds to opt-out of third-party API
  * integration for general and assets sections if specified in the optOutOptions.
- *
  * @param {WebDriver} driver - The Selenium WebDriver instance.
  * @param {object} optOutOptions - Optional. An object specifying which features to opt-out of.
  * @param {boolean} optOutOptions.basicFunctionality - Optional. Defaults to true. Opt-out of basic functionality.
@@ -663,11 +681,11 @@ const onboardingCompleteWalletCreationWithOptOut = async (
 };
 
 /**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Completes the onboarding flow for creating a new wallet with opt-out options.
  *
  * This function guides the user through the onboarding process of creating a new wallet,
  * including opting out of certain features as specified by the `optOutOptions` parameter.
- *
  * @param {object} driver - The Selenium driver instance.
  * @param {string} password - The password to use for the new wallet.
  * @param {object} optOutOptions - An object specifying the features to opt out of.
@@ -688,6 +706,11 @@ const completeCreateNewWalletOnboardingFlowWithOptOut = async (
   await onboardingCompleteWalletCreationWithOptOut(driver, optOutOptions);
 };
 
+/**
+ * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
+ * @param driver
+ * @param password
+ */
 const completeCreateNewWalletOnboardingFlow = async (driver, password) => {
   await onboardingBeginCreateNewWallet(driver);
   await onboardingChooseMetametricsOption(driver, false);
diff --git a/test/e2e/page-objects/flows/onboarding.flow.ts b/test/e2e/page-objects/flows/onboarding.flow.ts
index b5fda9e0c276..adf591330798 100644
--- a/test/e2e/page-objects/flows/onboarding.flow.ts
+++ b/test/e2e/page-objects/flows/onboarding.flow.ts
@@ -5,8 +5,19 @@ import OnboardingSrpPage from '../pages/onboarding/onboarding-srp-page';
 import StartOnboardingPage from '../pages/onboarding/start-onboarding-page';
 import SecureWalletPage from '../pages/onboarding/secure-wallet-page';
 import OnboardingCompletePage from '../pages/onboarding/onboarding-complete-page';
+import { WALLET_PASSWORD } from '../../helpers';
+import { E2E_SRP } from '../../default-fixture';
 
-export const createNewWalletOnboardingFlow = async (driver: Driver) => {
+/**
+ * Create new wallet onboarding flow
+ *
+ * @param driver - The WebDriver instance.
+ * @param password - The password to create. Defaults to WALLET_PASSWORD.
+ */
+export const createNewWalletOnboardingFlow = async (
+  driver: Driver,
+  password: string = WALLET_PASSWORD,
+) => {
   console.log('Starting the creation of a new wallet onboarding flow');
   await driver.navigate();
   const startOnboardingPage = new StartOnboardingPage(driver);
@@ -20,16 +31,33 @@ export const createNewWalletOnboardingFlow = async (driver: Driver) => {
 
   const onboardingPasswordPage = new OnboardingPasswordPage(driver);
   await onboardingPasswordPage.check_pageIsLoaded();
-  await onboardingPasswordPage.createWalletPassword();
+  await onboardingPasswordPage.createWalletPassword(password);
 
   const secureWalletPage = new SecureWalletPage(driver);
   await secureWalletPage.check_pageIsLoaded();
   await secureWalletPage.revealAndConfirmSRP();
 };
 
-export const importSRPOnboardingFlow = async (driver: Driver) => {
+/**
+ * Import SRP onboarding flow
+ *
+ * @param options - The options object.
+ * @param options.driver - The WebDriver instance.
+ * @param [options.seedPhrase] - The seed phrase to import.
+ * @param [options.password] - The password to use.
+ */
+export const importSRPOnboardingFlow = async ({
+  driver,
+  seedPhrase = E2E_SRP,
+  password = WALLET_PASSWORD,
+}: {
+  driver: Driver;
+  seedPhrase?: string;
+  password?: string;
+}): Promise<void> => {
   console.log('Starting the import of SRP onboarding flow');
   await driver.navigate();
+
   const startOnboardingPage = new StartOnboardingPage(driver);
   await startOnboardingPage.check_pageIsLoaded();
   await startOnboardingPage.checkTermsCheckbox();
@@ -41,26 +69,53 @@ export const importSRPOnboardingFlow = async (driver: Driver) => {
 
   const onboardingSrpPage = new OnboardingSrpPage(driver);
   await onboardingSrpPage.check_pageIsLoaded();
-  await onboardingSrpPage.fillSrp();
+  await onboardingSrpPage.fillSrp(seedPhrase);
   await onboardingSrpPage.clickConfirmButton();
 
   const onboardingPasswordPage = new OnboardingPasswordPage(driver);
   await onboardingPasswordPage.check_pageIsLoaded();
-  await onboardingPasswordPage.createImportedWalletPassword();
+  await onboardingPasswordPage.createImportedWalletPassword(password);
 };
 
-export const completeCreateNewWalletOnboardingFlow = async (driver: Driver) => {
+/**
+ * Complete create new wallet onboarding flow
+ *
+ * @param driver - The WebDriver instance.
+ * @param password - The password to use. Defaults to WALLET_PASSWORD.
+ */
+export const completeCreateNewWalletOnboardingFlow = async (
+  driver: Driver,
+  password: string = WALLET_PASSWORD,
+) => {
   console.log('start to complete create new wallet onboarding flow ');
-  await createNewWalletOnboardingFlow(driver);
+  await createNewWalletOnboardingFlow(driver, password);
   const onboardingCompletePage = new OnboardingCompletePage(driver);
   await onboardingCompletePage.check_pageIsLoaded();
   await onboardingCompletePage.check_congratulationsMessageIsDisplayed();
   await onboardingCompletePage.completeOnboarding();
 };
 
-export const completeImportSRPOnboardingFlow = async (driver: Driver) => {
-  console.log('start to complete import srp onboarding flow ');
-  await importSRPOnboardingFlow(driver);
+/**
+ * Complete import SRP onboarding flow
+ *
+ * @param options - The options object.
+ * @param options.driver - The WebDriver instance.
+ * @param [options.seedPhrase] - The seed phrase to import. Defaults to E2E_SRP.
+ * @param [options.password] - The password to use. Defaults to WALLET_PASSWORD.
+ * @returns A promise that resolves when the onboarding flow is complete.
+ */
+export const completeImportSRPOnboardingFlow = async ({
+  driver,
+  seedPhrase = E2E_SRP,
+  password = WALLET_PASSWORD,
+}: {
+  driver: Driver;
+  seedPhrase?: string;
+  password?: string;
+}): Promise<void> => {
+  console.log('Starting to complete import SRP onboarding flow');
+  await importSRPOnboardingFlow({ driver, seedPhrase, password });
+
   const onboardingCompletePage = new OnboardingCompletePage(driver);
   await onboardingCompletePage.check_pageIsLoaded();
   await onboardingCompletePage.check_walletReadyMessageIsDisplayed();
diff --git a/test/e2e/page-objects/pages/onboarding/onboarding-password-page.ts b/test/e2e/page-objects/pages/onboarding/onboarding-password-page.ts
index 81c2d21aceb6..ac8dd4f923f2 100644
--- a/test/e2e/page-objects/pages/onboarding/onboarding-password-page.ts
+++ b/test/e2e/page-objects/pages/onboarding/onboarding-password-page.ts
@@ -52,30 +52,26 @@ class OnboardingPasswordPage {
   /**
    * Create a password for new imported wallet
    *
-   * @param newPassword - The new password to create. Defaults to WALLET_PASSWORD.
-   * @param confirmPassword - The confirm password to create. Defaults to WALLET_PASSWORD.
+   * @param password - The password to create. Defaults to WALLET_PASSWORD.
    */
   async createImportedWalletPassword(
-    newPassword: string = WALLET_PASSWORD,
-    confirmPassword: string = WALLET_PASSWORD,
+    password: string = WALLET_PASSWORD,
   ): Promise<void> {
     console.log('Create password for new imported wallet');
-    await this.fillWalletPassword(newPassword, confirmPassword);
+    await this.fillWalletPassword(password, password);
     await this.driver.clickElementAndWaitToDisappear(this.importWalletButton);
   }
 
   /**
    * Create a password for new created wallet
    *
-   * @param newPassword - The new password to create. Defaults to WALLET_PASSWORD.
-   * @param confirmPassword - The confirm password to create. Defaults to WALLET_PASSWORD.
+   * @param password - The new password to create. Defaults to WALLET_PASSWORD.
    */
   async createWalletPassword(
-    newPassword: string = WALLET_PASSWORD,
-    confirmPassword: string = WALLET_PASSWORD,
+    password: string = WALLET_PASSWORD,
   ): Promise<void> {
     console.log('Create password for new created wallet');
-    await this.fillWalletPassword(newPassword, confirmPassword);
+    await this.fillWalletPassword(password, password);
     await this.driver.clickElementAndWaitToDisappear(this.createWalletButton);
   }
 
diff --git a/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts b/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
index da3e74153c67..b61279c8fe8c 100644
--- a/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
+++ b/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 import { Driver } from '../../../webdriver/driver';
-import { TEST_SEED_PHRASE } from '../../../helpers';
+import { E2E_SRP } from '../../../default-fixture';
 
 class OnboardingSrpPage {
   private driver: Driver;
@@ -53,9 +53,9 @@ class OnboardingSrpPage {
   /**
    * Fill the SRP words with the provided seed phrase
    *
-   * @param seedPhrase - The seed phrase to fill. Defaults to TEST_SEED_PHRASE.
+   * @param seedPhrase - The seed phrase to fill. Defaults to E2E_SRP.
    */
-  async fillSrp(seedPhrase: string = TEST_SEED_PHRASE): Promise<void> {
+  async fillSrp(seedPhrase: string = E2E_SRP): Promise<void> {
     await this.driver.pasteIntoField(this.srpWord0, seedPhrase);
   }
 
diff --git a/test/e2e/tests/network/multi-rpc.spec.ts b/test/e2e/tests/network/multi-rpc.spec.ts
index 362a4c3e29e4..ac693361435d 100644
--- a/test/e2e/tests/network/multi-rpc.spec.ts
+++ b/test/e2e/tests/network/multi-rpc.spec.ts
@@ -79,11 +79,11 @@ describe('MultiRpc:', function (this: Suite) {
         testSpecificMock: mockRPCURLAndChainId,
       },
 
-      async ({ driver }: { driver: Driver }) => {
-        await completeImportSRPOnboardingFlow(driver);
+      async ({ driver, ganacheServer }) => {
+        await completeImportSRPOnboardingFlow({ driver });
         const homePage = new HomePage(driver);
         await homePage.check_pageIsLoaded();
-        await homePage.check_expectedBalanceIsDisplayed();
+        await homePage.check_ganacheBalanceIsDisplayed(ganacheServer);
 
         await new HeaderNavbar(driver).clickSwitchNetworkDropDown();
         const selectNetworkDialog = new SelectNetwork(driver);
@@ -348,7 +348,7 @@ describe('MultiRpc:', function (this: Suite) {
       },
 
       async ({ driver }: { driver: Driver }) => {
-        await importSRPOnboardingFlow(driver);
+        await importSRPOnboardingFlow({ driver });
         const onboardingCompletePage = new OnboardingCompletePage(driver);
         await onboardingCompletePage.check_pageIsLoaded();
         await onboardingCompletePage.navigateToDefaultPrivacySettings();
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 1494d8b2ceb3..7b9e2378b058 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
@@ -1,9 +1,5 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-} from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockNotificationServices } from '../mocks';
 import {
@@ -14,6 +10,8 @@ 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 { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
 
@@ -28,7 +26,6 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server, {
@@ -42,12 +39,14 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -74,7 +73,6 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -85,12 +83,14 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
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 eb0c2c7b65e8..992027dd7840 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
@@ -1,16 +1,16 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-  completeCreateNewWalletOnboardingFlow,
-} from '../../../helpers';
+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 HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
+import HomePage from '../../../page-objects/pages/homepage';
+import {
+  completeCreateNewWalletOnboardingFlow,
+  completeImportSRPOnboardingFlow,
+} from '../../../page-objects/flows/onboarding.flow';
 import { getSRP, IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
 
 describe('Account syncing - New User @no-mmi', function () {
@@ -26,7 +26,6 @@ describe('Account syncing - New User @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -38,13 +37,14 @@ describe('Account syncing - New User @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-
           // Create a new wallet
           await completeCreateNewWalletOnboardingFlow(
             driver,
             NOTIFICATIONS_TEAM_PASSWORD,
           );
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           // Open account menu and validate 1 account is shown
           const header = new HeaderNavbar(driver);
@@ -75,7 +75,6 @@ describe('Account syncing - New User @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -86,14 +85,15 @@ describe('Account syncing - New User @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-
           // Onboard with import flow using SRP from new account created above
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            walletSrp,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: walletSrp,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           // Open account menu and validate the 2 accounts have been retrieved
           const header = new HeaderNavbar(driver);
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 5cf0bb3c4d19..f9574a27cb10 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
@@ -1,12 +1,5 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-  importSRPOnboardingFlow,
-  onboardingCompleteWalletCreationWithOptOut,
-  completeCreateNewWalletOnboardingFlowWithOptOut,
-} from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockNotificationServices } from '../mocks';
 import {
@@ -14,10 +7,18 @@ import {
   NOTIFICATIONS_TEAM_SEED_PHRASE,
 } 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 { accountsSyncMockResponse } from './mockData';
+import HeaderNavbar from '../../../page-objects/pages/header-navbar';
+import HomePage from '../../../page-objects/pages/homepage';
+import OnboardingCompletePage from '../../../page-objects/pages/onboarding/onboarding-complete-page';
+import OnboardingPrivacySettingsPage from '../../../page-objects/pages/onboarding/onboarding-privacy-settings-page';
+import {
+  createNewWalletOnboardingFlow,
+  importSRPOnboardingFlow,
+  completeImportSRPOnboardingFlow,
+} from '../../../page-objects/flows/onboarding.flow';
 import { getSRP, IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
+import { accountsSyncMockResponse } from './mockData';
 
 describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
   if (!IS_ACCOUNT_SYNCING_ENABLED) {
@@ -31,7 +32,6 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             // Mocks are still set up to ensure that requests are not matched
@@ -45,19 +45,25 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await importSRPOnboardingFlow(
+          await importSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
-
-          await onboardingCompleteWalletCreationWithOptOut(driver, {
-            isNewWallet: false,
-            basicFunctionality: false,
-            profileSync: true,
-            assets: false,
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
           });
+          const onboardingCompletePage = new OnboardingCompletePage(driver);
+          await onboardingCompletePage.check_pageIsLoaded();
+          await onboardingCompletePage.navigateToDefaultPrivacySettings();
+
+          const onboardingPrivacySettingsPage =
+            new OnboardingPrivacySettingsPage(driver);
+          await onboardingPrivacySettingsPage.toggleBasicFunctionalitySettings();
+          await onboardingPrivacySettingsPage.navigateBackToOnboardingCompletePage();
+          await onboardingCompletePage.check_pageIsLoaded();
+          await onboardingCompletePage.completeOnboarding();
+
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -85,7 +91,6 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             // Mocks are still set up to ensure that requests are not matched
@@ -97,17 +102,24 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeCreateNewWalletOnboardingFlowWithOptOut(
+          await createNewWalletOnboardingFlow(
             driver,
             NOTIFICATIONS_TEAM_PASSWORD,
-            {
-              isNewWallet: true,
-              basicFunctionality: false,
-              profileSync: true,
-              assets: false,
-            },
           );
+          const onboardingCompletePage = new OnboardingCompletePage(driver);
+          await onboardingCompletePage.check_pageIsLoaded();
+          await onboardingCompletePage.navigateToDefaultPrivacySettings();
+
+          const onboardingPrivacySettingsPage =
+            new OnboardingPrivacySettingsPage(driver);
+          await onboardingPrivacySettingsPage.toggleBasicFunctionalitySettings();
+          await onboardingPrivacySettingsPage.navigateBackToOnboardingCompletePage();
+          await onboardingCompletePage.check_pageIsLoaded();
+          await onboardingCompletePage.completeOnboarding();
+
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -120,7 +132,6 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
             'Account 1',
           );
           await accountListPage.addNewAccountWithCustomLabel('New Account');
-
           // Set SRP to use for retreival
           walletSrp = await getSRP(driver, NOTIFICATIONS_TEAM_PASSWORD);
           if (!walletSrp) {
@@ -132,7 +143,6 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             // Mocks are still set up to ensure that requests are not matched
@@ -144,12 +154,14 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            walletSrp,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: walletSrp,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
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 d6c0dc373f69..31f92520f13e 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
@@ -1,9 +1,5 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-} from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockNotificationServices } from '../mocks';
 import {
@@ -13,6 +9,8 @@ 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 { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
 
@@ -27,7 +25,6 @@ describe('Account syncing - Add Account @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server, {
@@ -41,12 +38,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -72,7 +71,6 @@ describe('Account syncing - Add Account @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -83,12 +81,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -122,7 +122,6 @@ describe('Account syncing - Add Account @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server, {
@@ -136,12 +135,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -165,7 +166,6 @@ describe('Account syncing - Add Account @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -176,12 +176,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
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 418962b370de..45ee3ab23a85 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
@@ -1,9 +1,5 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-} from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockNotificationServices } from '../mocks';
 import {
@@ -13,6 +9,8 @@ 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 { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
 
@@ -27,7 +25,6 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server, {
@@ -41,12 +38,14 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
@@ -71,7 +70,6 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server);
@@ -82,12 +80,14 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
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 4ec904256525..5bebe7220e49 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
@@ -1,9 +1,5 @@
 import { Mockttp } from 'mockttp';
-import {
-  withFixtures,
-  defaultGanacheOptions,
-  completeImportSRPOnboardingFlow,
-} from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockNotificationServices } from '../mocks';
 import {
@@ -13,6 +9,8 @@ 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 { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
 
@@ -27,7 +25,6 @@ describe('Account syncing - Onboarding @no-mmi', function () {
       await withFixtures(
         {
           fixtures: new FixtureBuilder({ onboarding: true }).build(),
-          ganacheOptions: defaultGanacheOptions,
           title: this.test?.fullTitle(),
           testSpecificMock: (server: Mockttp) => {
             userStorageMockttpController.setupPath('accounts', server, {
@@ -40,12 +37,14 @@ describe('Account syncing - Onboarding @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await driver.navigate();
-          await completeImportSRPOnboardingFlow(
+          await completeImportSRPOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_SEED_PHRASE,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
 
           const header = new HeaderNavbar(driver);
           await header.check_pageIsLoaded();
diff --git a/test/e2e/tests/onboarding/onboarding.spec.ts b/test/e2e/tests/onboarding/onboarding.spec.ts
index aa04ca151f86..9ea81f040998 100644
--- a/test/e2e/tests/onboarding/onboarding.spec.ts
+++ b/test/e2e/tests/onboarding/onboarding.spec.ts
@@ -1,5 +1,6 @@
 import {
   convertToHexValue,
+  TEST_SEED_PHRASE,
   WALLET_PASSWORD,
   withFixtures,
 } from '../../helpers';
@@ -55,7 +56,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await completeImportSRPOnboardingFlow(driver);
+        await completeImportSRPOnboardingFlow({ driver });
         const homePage = new HomePage(driver);
         await homePage.check_pageIsLoaded();
         await homePage.check_expectedBalanceIsDisplayed();
@@ -164,7 +165,10 @@ describe('MetaMask onboarding @no-mmi', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver, secondaryGanacheServer }) => {
-        await importSRPOnboardingFlow(driver);
+        await importSRPOnboardingFlow({
+          driver,
+          seedPhrase: TEST_SEED_PHRASE,
+        });
 
         const onboardingCompletePage = new OnboardingCompletePage(driver);
         await onboardingCompletePage.check_pageIsLoaded();
@@ -209,7 +213,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }) => {
-        await importSRPOnboardingFlow(driver);
+        await importSRPOnboardingFlow({ driver });
 
         const onboardingCompletePage = new OnboardingCompletePage(driver);
         await onboardingCompletePage.check_pageIsLoaded();
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 b18d713d9474..1644cb068a3a 100644
--- a/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
+++ b/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
@@ -146,7 +146,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         testSpecificMock: mockInfura,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await importSRPOnboardingFlow(driver);
+        await importSRPOnboardingFlow({ driver });
 
         // Check no requests before completing onboarding
         // Intended delay to ensure we cover at least 1 polling loop of time for the network request

From 04e4542ea5cb434ccb5d596b326e4e899335a662 Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:35:59 +0100
Subject: [PATCH 032/111] chore: add the gas_included prop into Quotes
 Requested event (#28295)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
Adds the gas_included prop into Quotes Requested event in swaps.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to Swaps on Ethereum mainnet
2. Fill in the form with max ETH -> ERC20
3. You will see in a network request that the new prop is there for the
Quotes Requested event

## **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.
---
 ui/ducks/swaps/swaps.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 8dd7336d7a62..d23c0ce69381 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -858,6 +858,7 @@ export const fetchQuotesAndSetQuoteState = (
             stx_enabled: smartTransactionsEnabled,
             current_stx_enabled: currentSmartTransactionsEnabled,
             stx_user_opt_in: getSmartTransactionsOptInStatusForMetrics(state),
+            gas_included: newSelectedQuote.isGasIncludedTrade,
             anonymizedData: true,
           },
         });

From 74e163fc106f96f4eea44cc78f180f2e706a5b16 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:51:28 +0100
Subject: [PATCH 033/111] fix: flaky test `Phishing Detection Via Iframe should
 redirect users to the the MetaMask Phishing Detection page when an iframe
 domain is on the phishing blocklist` (#28293)
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**

There is a race condition in our Extension e2e tests, where we click the
continue to unsafe link before the event listener has been attached.
This causes the click to not take any effect and the test fail
sometimes.

Here is an example of the failure:
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/103699/workflows/b2ef7c35-f54a-4ea8-bd8b-15e57585d6fe/jobs/3865722/artifacts

See how after clicking the anchor element, the redirect never happens,
because the click was done before the event listener was added.


![image](https://github.com/user-attachments/assets/92663874-9175-4aa0-af86-0c4859e087bf)




[The fix has been done in the phishing page
level](https://github.com/MetaMask/phishing-warning/pull/173), where I
added a new test id once the event listener click has been added, so we
can now wait for that selector id to be in the page, before clicking.


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

## **Related issues**

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

## **Manual testing steps**

1. Check ci

## **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**

- [ ] 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.
---
 .../phishing-detection.spec.js                | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.js b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
index 67fb82f8fa55..ad199cea1e70 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
@@ -58,6 +58,12 @@ describe('Phishing Detection', function () {
         await unlockWallet(driver);
         await openDapp(driver);
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+
+        // we need to wait for this selector to mitigate a race condition on the phishing page site
+        // see more here https://github.com/MetaMask/phishing-warning/pull/173
+        await driver.waitForSelector({
+          testId: 'unsafe-continue-loaded',
+        });
         await driver.clickElement({
           text: 'Proceed anyway',
         });
@@ -103,10 +109,15 @@ describe('Phishing Detection', function () {
         }
 
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+
+        // we need to wait for this selector to mitigate a race condition on the phishing page site
+        // see more here https://github.com/MetaMask/phishing-warning/pull/173
+        await driver.waitForSelector({
+          testId: 'unsafe-continue-loaded',
+        });
         await driver.clickElement({
           text: 'Proceed anyway',
         });
-
         await driver.wait(until.titleIs(WINDOW_TITLES.TestDApp), 10000);
       };
     }
@@ -169,6 +180,12 @@ describe('Phishing Detection', function () {
           text: 'Open this warning in a new tab',
         });
         await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+
+        // we need to wait for this selector to mitigate a race condition on the phishing page site
+        // see more here https://github.com/MetaMask/phishing-warning/pull/173
+        await driver.waitForSelector({
+          testId: 'unsafe-continue-loaded',
+        });
         await driver.clickElement({
           text: 'Proceed anyway',
         });

From f117f7c864526ac9c326912b8050bc1456cb7697 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 6 Nov 2024 16:25:57 +0530
Subject: [PATCH 034/111] fix: use transaction address to get lock for custom
 nonce (#28272)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Use transaction from address to get custom nonce value.

## **Related issues**

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

## **Manual testing steps**

1. Enable an account connected to the dApp
2. Switch to non-enabled account in the MetaMask
3. Initiate a transaction from the dApp
4. Ensure correct nonce is displayed

## **Screenshots/Recordings**
TODO

## **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
- [ ] 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.
---
 ui/hooks/useMMICustodySendTransaction.ts           |  6 +++---
 .../approve-static-simulation.tsx                  |  5 ++---
 .../components/confirm/info/approve/approve.tsx    |  5 ++---
 .../edit-spending-cap-modal.tsx                    |  5 ++---
 .../revoke-static-simulation.tsx                   |  5 ++---
 .../info/approve/spending-cap/spending-cap.tsx     | 10 ++++------
 .../shared/advanced-details/advanced-details.tsx   | 14 ++++++++++++--
 .../confirm-approve/confirm-approve.js             |  4 ++--
 .../confirm-transaction-base.component.js          |  9 ++++++---
 .../confirm-transaction-base.container.js          |  2 +-
 .../token-allowance/token-allowance.js             |  8 ++++----
 ui/store/actions.ts                                | 11 ++++-------
 12 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/ui/hooks/useMMICustodySendTransaction.ts b/ui/hooks/useMMICustodySendTransaction.ts
index 0c05d9e16f96..49634fbf0174 100644
--- a/ui/hooks/useMMICustodySendTransaction.ts
+++ b/ui/hooks/useMMICustodySendTransaction.ts
@@ -34,9 +34,9 @@ export function useMMICustodySendTransaction() {
   const accountType = useSelector(getAccountType);
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
 
-  const { currentConfirmation } = useConfirmContext() as unknown as {
-    currentConfirmation: TransactionMeta | undefined;
-  };
+  const { currentConfirmation } = useConfirmContext<
+    TransactionMeta | undefined
+  >();
   const { from } = getConfirmationSender(currentConfirmation);
   const fromChecksumHexAddress = toChecksumHexAddress(from || '');
 
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
index f1117e2a22b2..ad8a3565f619 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
@@ -25,9 +25,8 @@ import { useIsNFT } from '../hooks/use-is-nft';
 export const ApproveStaticSimulation = () => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { decimals: initialDecimals } = useAssetDetails(
     transactionMeta?.txParams?.to,
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
index fed03a75e17e..fa1766a8aa72 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
@@ -18,9 +18,8 @@ import { RevokeStaticSimulation } from './revoke-static-simulation/revoke-static
 import { SpendingCap } from './spending-cap/spending-cap';
 
 const ApproveInfo = () => {
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { isNFT } = useIsNFT(transactionMeta);
 
diff --git a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
index f908333e4f25..961e63ae8f92 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
@@ -47,9 +47,8 @@ export const EditSpendingCapModal = ({
 
   const dispatch = useDispatch();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { userBalance, tokenSymbol, decimals } = useAssetDetails(
     transactionMeta.txParams.to,
diff --git a/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
index 77cee271d667..e121e01b6320 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
@@ -12,9 +12,8 @@ import StaticSimulation from '../../shared/static-simulation/static-simulation';
 export const RevokeStaticSimulation = () => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { chainId } = transactionMeta;
 
diff --git a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
index 2ebd9d8e7e4e..638ff638844c 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
@@ -28,9 +28,8 @@ const SpendingCapGroup = ({
 }) => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { spendingCap, formattedSpendingCap, value } =
     useApproveTokenSimulation(transactionMeta, decimals);
@@ -81,9 +80,8 @@ export const SpendingCap = ({
 }) => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { userBalance, tokenSymbol, decimals } = useAssetDetails(
     transactionMeta.txParams.to,
diff --git a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.tsx b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.tsx
index ebb0f69d75c1..d0a6d72d11e9 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { TransactionMeta } from '@metamask/transaction-controller';
+
 import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
@@ -17,15 +19,23 @@ import {
   updateCustomNonce,
 } from '../../../../../../../store/actions';
 import { selectConfirmationAdvancedDetailsOpen } from '../../../../../selectors/preferences';
+import { useConfirmContext } from '../../../../../context/confirm';
+import { isSignatureTransactionType } from '../../../../../utils';
 import { TransactionData } from '../transaction-data/transaction-data';
 
 const NonceDetails = () => {
+  const { currentConfirmation } = useConfirmContext<TransactionMeta>();
   const t = useI18nContext();
   const dispatch = useDispatch();
 
   useEffect(() => {
-    dispatch(getNextNonce());
-  }, [dispatch]);
+    if (
+      currentConfirmation &&
+      !isSignatureTransactionType(currentConfirmation)
+    ) {
+      dispatch(getNextNonce(currentConfirmation.txParams.from));
+    }
+  }, [currentConfirmation, dispatch]);
 
   const enableCustomNonce = useSelector(getUseNonceField);
   const nextNonce = useSelector(getNextSuggestedNonce);
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.js b/ui/pages/confirmations/confirm-approve/confirm-approve.js
index a5dcaeb6202d..1b604ec43e6b 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.js
@@ -66,7 +66,7 @@ export default function ConfirmApprove({
   isSetApproveForAll,
 }) {
   const dispatch = useDispatch();
-  const { txParams: { data: transactionData } = {} } = transaction;
+  const { txParams: { data: transactionData, from } = {} } = transaction;
 
   const currentCurrency = useSelector(getCurrentCurrency);
   const nativeCurrency = useSelector(getNativeCurrency);
@@ -266,7 +266,7 @@ export default function ConfirmApprove({
               updateCustomNonce={(value) => {
                 dispatch(updateCustomNonce(value));
               }}
-              getNextNonce={() => dispatch(getNextNonce())}
+              getNextNonce={() => dispatch(getNextNonce(from))}
               showCustomizeNonceModal={({
                 /* eslint-disable no-shadow */
                 useNonceField,
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index c07b8a263f8a..25d99e8a9f16 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -217,6 +217,7 @@ export default class ConfirmTransactionBase extends Component {
       mostRecentOverviewPage,
       txData,
       getNextNonce,
+      fromAddress,
     } = this.props;
 
     const {
@@ -236,7 +237,7 @@ export default class ConfirmTransactionBase extends Component {
       transactionStatus === TransactionStatus.confirmed;
 
     if (txData.id !== prevTxData.id) {
-      getNextNonce();
+      getNextNonce(fromAddress);
     }
 
     if (
@@ -413,6 +414,7 @@ export default class ConfirmTransactionBase extends Component {
       tokenSymbol,
       isUsingPaymaster,
       isSigningOrSubmitting,
+      fromAddress,
     } = this.props;
 
     const { t } = this.context;
@@ -447,7 +449,7 @@ export default class ConfirmTransactionBase extends Component {
 
       updateCustomNonce(inputValue);
 
-      getNextNonce();
+      getNextNonce(fromAddress);
     };
 
     const renderTotalMaxAmount = ({
@@ -1012,6 +1014,7 @@ export default class ConfirmTransactionBase extends Component {
     this._isMounted = true;
     const {
       toAddress,
+      fromAddress,
       txData: { origin, chainId: txChainId } = {},
       getNextNonce,
       tryReverseResolveAddress,
@@ -1041,7 +1044,7 @@ export default class ConfirmTransactionBase extends Component {
       },
     });
 
-    getNextNonce();
+    getNextNonce(fromAddress);
     if (toAddress) {
       tryReverseResolveAddress(toAddress);
     }
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
index e06090f48e75..795dfae0c63a 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
@@ -429,7 +429,7 @@ export const mapDispatchToProps = (dispatch) => {
     fetchSmartTransactionsLiveness: () => {
       dispatch(fetchSmartTransactionsLiveness());
     },
-    getNextNonce: () => dispatch(getNextNonce()),
+    getNextNonce: (address) => dispatch(getNextNonce(address)),
     setNextNonce: (val) => dispatch(setNextNonce(val)),
     setDefaultHomeActiveTabName: (tabName) =>
       dispatch(setDefaultHomeActiveTabName(tabName)),
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.js b/ui/pages/confirmations/token-allowance/token-allowance.js
index 8ccd19ecb566..61bf5e0974df 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.js
@@ -347,12 +347,12 @@ export default function TokenAllowance({
   };
 
   const handleNextNonce = useCallback(() => {
-    dispatch(getNextNonce());
-  }, [getNextNonce, dispatch]);
+    dispatch(getNextNonce(txData.txParams.from));
+  }, [dispatch, txData.txParams.from]);
 
   useEffect(() => {
-    dispatch(getNextNonce());
-  }, [getNextNonce, dispatch]);
+    dispatch(getNextNonce(txData.txParams.from));
+  }, [dispatch, txData.txParams.from]);
 
   const handleUpdateCustomNonce = (value) => {
     dispatch(updateCustomNonce(value));
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 11df6a3f3e20..8018595371f4 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4374,16 +4374,13 @@ export function setNextNonce(nextNonce: string): PayloadAction<string> {
  * accidental usage of a stale nonce as the call to getNextNonce only works for
  * the currently selected address.
  *
+ * @param address - address for which nonce lock shouuld be obtained.
  * @returns
  */
-export function getNextNonce(): ThunkAction<
-  Promise<string>,
-  MetaMaskReduxState,
-  unknown,
-  AnyAction
-> {
+export function getNextNonce(
+  address,
+): ThunkAction<Promise<string>, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch, getState) => {
-    const { address } = getSelectedInternalAccount(getState());
     const networkClientId = getSelectedNetworkClientId(getState());
     let nextNonce;
     try {

From e1f09aa52ff0019221396010abd03a96ed62b2b8 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:44:13 +0700
Subject: [PATCH 035/111] fix: GasDetailItem invalid paddingStart prop (#28281)
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 console error that appears

no ui/ux changes

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Use native send tx confirmation
2. Set "Max" fee
3. Click continue
4. notice error

## **Screenshots/Recordings**

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

### **Before**

![CleanShot 2024-11-01 at 01 27
44@2x](https://github.com/user-attachments/assets/e639850f-7999-4eba-83aa-780c28778e02)


### **After**

error no longer occurs

## **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.
---
 .../__snapshots__/confirm-gas-display.test.js.snap        | 7 +++----
 .../components/gas-details-item/gas-details-item.js       | 8 ++++----
 .../__snapshots__/confirm-send-ether.test.js.snap         | 7 +++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap b/ui/pages/confirmations/components/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap
index e35c865829b8..aa39688362e6 100644
--- a/ui/pages/confirmations/components/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap
+++ b/ui/pages/confirmations/components/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap
@@ -93,10 +93,10 @@ exports[`ConfirmGasDisplay should match snapshot 1`] = `
         class="mm-box mm-text transaction-detail-item__row-subText mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
       >
         <div
-          class="box gas-details-item__gasfee-label box--display-inline-flex box--flex-direction-row"
+          class="mm-box gas-details-item__gasfee-label mm-box--display-inline-flex"
         >
           <div
-            class="box box--flex-direction-row"
+            class="mm-box"
           >
             <p
               class="mm-box mm-text mm-text--body-sm-medium mm-box--color-text-alternative"
@@ -105,8 +105,7 @@ exports[`ConfirmGasDisplay should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="gas-details-item__currency-container"
-            paddingstart="1"
+            class="mm-box gas-details-item__currency-container mm-box--padding-inline-start-1"
           >
             <div
               class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
diff --git a/ui/pages/confirmations/components/gas-details-item/gas-details-item.js b/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
index c861a9dce9d9..94fc1d38bb54 100644
--- a/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
+++ b/ui/pages/confirmations/components/gas-details-item/gas-details-item.js
@@ -4,6 +4,7 @@ import classNames from 'classnames';
 
 import { useSelector } from 'react-redux';
 import {
+  Box,
   Icon,
   IconName,
   IconSize,
@@ -30,7 +31,6 @@ import { useDraftTransactionWithTxParams } from '../../hooks/useDraftTransaction
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
-import Box from '../../../../components/ui/box';
 import LoadingHeartBeat from '../../../../components/ui/loading-heartbeat';
 import EditGasFeeIcon from '../edit-gas-fee-icon/edit-gas-fee-icon';
 import GasTiming from '../gas-timing/gas-timing.component';
@@ -194,10 +194,10 @@ const GasDetailsItem = ({
                 {t('editGasSubTextFeeLabel')}
               </Text>
             </Box>
-            <div
+            <Box
               key="editGasSubTextFeeValue"
               className="gas-details-item__currency-container"
-              paddingStart={1}
+              paddingInlineStart={1}
             >
               <LoadingHeartBeat estimateUsed={estimateUsed} />
               <UserPreferencedCurrencyDisplay
@@ -215,7 +215,7 @@ const GasDetailsItem = ({
                   getMaxTransactionFeeTotal || draftHexMaximumTransactionFee
                 }
               />
-            </div>
+            </Box>
           </Box>
         </>
       }
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 0da1e036c9f0..9ec3f2ac08d2 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
@@ -503,10 +503,10 @@ exports[`ConfirmSendEther should render correct information for for confirm send
                     class="mm-box mm-text transaction-detail-item__row-subText mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
                   >
                     <div
-                      class="box gas-details-item__gasfee-label box--display-inline-flex box--flex-direction-row"
+                      class="mm-box gas-details-item__gasfee-label mm-box--display-inline-flex"
                     >
                       <div
-                        class="box box--flex-direction-row"
+                        class="mm-box"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-sm-medium mm-box--color-text-alternative"
@@ -515,8 +515,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
                         </p>
                       </div>
                       <div
-                        class="gas-details-item__currency-container"
-                        paddingstart="1"
+                        class="mm-box gas-details-item__currency-container mm-box--padding-inline-start-1"
                       >
                         <div
                           class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"

From 64424be53aa3fcd2b051a8cf783fec1ea979512d Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 6 Nov 2024 19:34:35 +0700
Subject: [PATCH 036/111] feat: Enable simulation metrics for redesign
 transactions (#28280)
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/28280?quickstart=1)

## **Related issues**

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

## **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.
---
 .../confirm/info/base-transaction-info/base-transaction-info.tsx | 1 +
 .../components/confirm/info/native-transfer/native-transfer.tsx  | 1 +
 .../confirm/info/nft-token-transfer/nft-token-transfer.tsx       | 1 +
 .../components/confirm/info/token-transfer/token-transfer.tsx    | 1 +
 4 files changed, 4 insertions(+)

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 08329536b524..23629ee5096c 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
@@ -22,6 +22,7 @@ const BaseTransactionInfo = () => {
         <SimulationDetails
           transaction={transactionMeta}
           isTransactionsRedesign
+          enableMetrics
         />
       </ConfirmInfoSection>
       <TransactionDetails />
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 a2dd3ceaaa05..c098936989dd 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
@@ -24,6 +24,7 @@ const NativeTransferInfo = () => {
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
+            enableMetrics
           />
         </ConfirmInfoSection>
       )}
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 b5d579994ef9..113920a6aec2 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
@@ -24,6 +24,7 @@ const NFTTokenTransferInfo = () => {
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
+            enableMetrics
           />
         </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 df1136ec5213..50e9d85936f0 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
@@ -24,6 +24,7 @@ const TokenTransferInfo = () => {
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
+            enableMetrics
           />
         </ConfirmInfoSection>
       )}

From e5b415f97a4de7eab023eb689357f467c0e6f5c5 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 6 Nov 2024 18:09:35 +0530
Subject: [PATCH 037/111] chore: adding e2e tests for NFT permit (#28004)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adding e2e tests for NFT permit.

## **Related issues**

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

## **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
- [ ] 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.
---
 package.json                                  |   2 +-
 privacy-snapshot.json                         |   1 +
 .../signatures/nft-permit.spec.ts             | 187 ++++++++++++++++++
 .../signatures/signature-helpers.ts           |  14 +-
 .../tests/tokens/add-multiple-tokens.spec.js  |  11 +-
 yarn.lock                                     |  10 +-
 6 files changed, 215 insertions(+), 10 deletions(-)
 create mode 100644 test/e2e/tests/confirmations/signatures/nft-permit.spec.ts

diff --git a/package.json b/package.json
index 1672e6845873..921472a1c27e 100644
--- a/package.json
+++ b/package.json
@@ -466,7 +466,7 @@
     "@metamask/phishing-warning": "^4.1.0",
     "@metamask/preferences-controller": "^13.0.2",
     "@metamask/test-bundler": "^1.0.0",
-    "@metamask/test-dapp": "8.7.0",
+    "@metamask/test-dapp": "8.13.0",
     "@octokit/core": "^3.6.0",
     "@open-rpc/meta-schema": "^1.14.6",
     "@open-rpc/mock-server": "^1.7.5",
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 589504ea2cc7..6e041ea3d71b 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -32,6 +32,7 @@
   "localhost:8000",
   "localhost:8545",
   "mainnet.infura.io",
+  "metamask-sdk.api.cx.metamask.io",
   "metamask.eth",
   "metamask.github.io",
   "metametrics.metamask.test",
diff --git a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts
new file mode 100644
index 000000000000..383a3bd6b924
--- /dev/null
+++ b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts
@@ -0,0 +1,187 @@
+import { strict as assert } from 'assert';
+import { TransactionEnvelopeType } from '@metamask/transaction-controller';
+import { Suite } from 'mocha';
+import { MockedEndpoint } from 'mockttp';
+import { DAPP_HOST_ADDRESS, WINDOW_TITLES } from '../../../helpers';
+import { Ganache } from '../../../seeder/ganache';
+import { Driver } from '../../../webdriver/driver';
+import {
+  mockSignatureApproved,
+  mockSignatureRejected,
+  scrollAndConfirmAndAssertConfirm,
+  withRedesignConfirmationFixtures,
+} from '../helpers';
+import { TestSuiteArguments } from '../transactions/shared';
+import {
+  assertAccountDetailsMetrics,
+  assertPastedAddress,
+  assertSignatureConfirmedMetrics,
+  assertSignatureRejectedMetrics,
+  clickHeaderInfoBtn,
+  copyAddressAndPasteWalletAddress,
+  openDappAndTriggerDeploy,
+  SignatureType,
+  triggerSignature,
+} from './signature-helpers';
+
+describe('Confirmation Signature - NFT Permit @no-mmi', function (this: Suite) {
+  it('initiates and confirms and emits the correct events', async function () {
+    await withRedesignConfirmationFixtures(
+      this.test?.fullTitle(),
+      TransactionEnvelopeType.legacy,
+      async ({
+        driver,
+        ganacheServer,
+        mockedEndpoint: mockedEndpoints,
+      }: TestSuiteArguments) => {
+        const addresses = await (ganacheServer as Ganache).getAccounts();
+        const publicAddress = addresses?.[0] as string;
+
+        await openDappAndTriggerDeploy(driver);
+        await driver.delay(1000);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+        await driver.clickElement('[data-testid="confirm-footer-button"]');
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.delay(1000);
+        await triggerSignature(driver, SignatureType.NFTPermit);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await clickHeaderInfoBtn(driver);
+        await copyAddressAndPasteWalletAddress(driver);
+        await assertPastedAddress(driver);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await assertInfoValues(driver);
+        await scrollAndConfirmAndAssertConfirm(driver);
+        await driver.delay(1000);
+
+        await assertAccountDetailsMetrics(
+          driver,
+          mockedEndpoints as MockedEndpoint[],
+          'eth_signTypedData_v4',
+        );
+
+        await assertSignatureConfirmedMetrics({
+          driver,
+          mockedEndpoints: mockedEndpoints as MockedEndpoint[],
+          signatureType: 'eth_signTypedData_v4',
+          primaryType: 'Permit',
+          uiCustomizations: ['redesigned_confirmation', 'permit'],
+        });
+
+        await assertVerifiedResults(driver, publicAddress);
+      },
+      mockSignatureApproved,
+    );
+  });
+
+  it('initiates and rejects and emits the correct events', async function () {
+    await withRedesignConfirmationFixtures(
+      this.test?.fullTitle(),
+      TransactionEnvelopeType.legacy,
+      async ({
+        driver,
+        mockedEndpoint: mockedEndpoints,
+      }: TestSuiteArguments) => {
+        await openDappAndTriggerDeploy(driver);
+        await driver.delay(1000);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+        await driver.clickElement('[data-testid="confirm-footer-button"]');
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.delay(1000);
+        await triggerSignature(driver, SignatureType.NFTPermit);
+
+        await driver.clickElementAndWaitForWindowToClose(
+          '[data-testid="confirm-footer-cancel-button"]',
+        );
+
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        await driver.waitForSelector({
+          tag: 'span',
+          text: 'Error: User rejected the request.',
+        });
+
+        await assertSignatureRejectedMetrics({
+          driver,
+          mockedEndpoints: mockedEndpoints as MockedEndpoint[],
+          signatureType: 'eth_signTypedData_v4',
+          primaryType: 'Permit',
+          uiCustomizations: ['redesigned_confirmation', 'permit'],
+          location: 'confirmation',
+        });
+      },
+      mockSignatureRejected,
+    );
+  });
+});
+
+async function assertInfoValues(driver: Driver) {
+  await driver.clickElement('[data-testid="sectionCollapseButton"]');
+  const origin = driver.findElement({ text: DAPP_HOST_ADDRESS });
+  const contractPetName = driver.findElement({
+    css: '.name__value',
+    text: '0x581c3...45947',
+  });
+
+  const title = driver.findElement({ text: 'Withdrawal request' });
+  const description = driver.findElement({
+    text: 'This site wants permission to withdraw your NFTs',
+  });
+  const primaryType = driver.findElement({ text: 'Permit' });
+  const spender = driver.findElement({
+    css: '.name__value',
+    text: '0x581c3...45947',
+  });
+  const tokenId = driver.findElement({ text: '3606393' });
+  const nonce = driver.findElement({ text: '0' });
+  const deadline = driver.findElement({ text: '23 December 2024, 23:03' });
+
+  assert.ok(await origin, 'origin');
+  assert.ok(await contractPetName, 'contractPetName');
+  assert.ok(await title, 'title');
+  assert.ok(await description, 'description');
+  assert.ok(await primaryType, 'primaryType');
+  assert.ok(await spender, 'spender');
+  assert.ok(await tokenId, 'tokenId');
+  assert.ok(await nonce, 'nonce');
+  assert.ok(await deadline, 'deadline');
+}
+
+async function assertVerifiedResults(driver: Driver, publicAddress: string) {
+  await driver.waitUntilXWindowHandles(2);
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+  await driver.clickElement('#sign721PermitVerify');
+
+  await driver.waitForSelector({
+    css: '#sign721PermitVerifyResult',
+    text: publicAddress,
+  });
+
+  await driver.waitForSelector({
+    css: '#sign721PermitResult',
+    text: '0x572bc6300f6aa669e85e0a7792bc0b0803fb70c3c492226b30007ff7030b03600e390ef295a5a525d19f444943ae82697f0e5b5b0d77cc382cb2ea9486ec27801c',
+  });
+
+  await driver.waitForSelector({
+    css: '#sign721PermitResultR',
+    text: 'r: 0x572bc6300f6aa669e85e0a7792bc0b0803fb70c3c492226b30007ff7030b0360',
+  });
+
+  await driver.waitForSelector({
+    css: '#sign721PermitResultS',
+    text: 's: 0x0e390ef295a5a525d19f444943ae82697f0e5b5b0d77cc382cb2ea9486ec2780',
+  });
+
+  await driver.waitForSelector({
+    css: '#sign721PermitResultV',
+    text: 'v: 28',
+  });
+
+  await driver.waitForSelector({
+    css: '#sign721PermitVerifyResult',
+    text: publicAddress,
+  });
+}
diff --git a/test/e2e/tests/confirmations/signatures/signature-helpers.ts b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
index 9b87e5b4e9cc..5242be3f3c20 100644
--- a/test/e2e/tests/confirmations/signatures/signature-helpers.ts
+++ b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
@@ -14,6 +14,7 @@ export const WALLET_ETH_BALANCE = '25';
 export enum SignatureType {
   PersonalSign = '#personalSign',
   Permit = '#signPermit',
+  NFTPermit = '#sign721Permit',
   SignTypedDataV3 = '#signTypedDataV3',
   SignTypedDataV4 = '#signTypedDataV4',
   SignTypedData = '#signTypedData',
@@ -240,12 +241,23 @@ export async function assertPastedAddress(driver: Driver) {
   assert.equal(await formFieldEl.getAttribute('value'), WALLET_ADDRESS);
 }
 
+export async function triggerSignature(driver: Driver, type: string) {
+  await driver.clickElement(type);
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+}
+
 export async function openDappAndTriggerSignature(
   driver: Driver,
   type: string,
 ) {
   await unlockWallet(driver);
   await openDapp(driver);
-  await driver.clickElement(type);
+  await triggerSignature(driver, type);
+}
+
+export async function openDappAndTriggerDeploy(driver: Driver) {
+  await unlockWallet(driver);
+  await openDapp(driver);
+  await driver.clickElement('#deployNFTsButton');
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 }
diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.js b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
index 490460e770cb..8be2a430b622 100644
--- a/test/e2e/tests/tokens/add-multiple-tokens.spec.js
+++ b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
@@ -28,6 +28,11 @@ describe('Multiple ERC20 Watch Asset', function () {
         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' });
@@ -37,7 +42,7 @@ describe('Multiple ERC20 Watch Asset', function () {
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
         await driver.wait(async () => {
           const tokenAddressesElement = await driver.findElement(
-            '#tokenAddresses',
+            '#erc20TokenAddresses',
           );
           const tokenAddresses = await tokenAddressesElement.getText();
           return tokenAddresses !== '';
@@ -53,7 +58,7 @@ describe('Multiple ERC20 Watch Asset', function () {
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
         await driver.wait(async () => {
           const tokenAddressesElement = await driver.findElement(
-            '#tokenAddresses',
+            '#erc20TokenAddresses',
           );
           const tokenAddresses = await tokenAddressesElement.getText();
           return tokenAddresses.split(',').length === 2;
@@ -69,7 +74,7 @@ describe('Multiple ERC20 Watch Asset', function () {
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
         await driver.wait(async () => {
           const tokenAddressesElement = await driver.findElement(
-            '#tokenAddresses',
+            '#erc20TokenAddresses',
           );
           const tokenAddresses = await tokenAddressesElement.getText();
           return tokenAddresses.split(',').length === 3;
diff --git a/yarn.lock b/yarn.lock
index 9ac1b7409679..4c3305e98b13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6386,10 +6386,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/test-dapp@npm:8.7.0":
-  version: 8.7.0
-  resolution: "@metamask/test-dapp@npm:8.7.0"
-  checksum: 10/c2559179d3372e5fc8d67a60c1e4056fad9809486eaff6a2aa9c351a2a613eeecc15885a5fd9b71b8f4139058fe168abeac06bd6bdb6d4a47fe0b9b4146923ab
+"@metamask/test-dapp@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@metamask/test-dapp@npm:8.13.0"
+  checksum: 10/b588e562ce81d94e22e8c19b6b160b6dc1c5f68314edaeeb3c886a0676d4bd21205c741d039a1a8ad2dfc1e87109239d18da17c322fbaa99f527b543b0032786
   languageName: node
   linkType: hard
 
@@ -26470,7 +26470,7 @@ __metadata:
     "@metamask/snaps-sdk": "npm:^6.10.0"
     "@metamask/snaps-utils": "npm:^8.5.1"
     "@metamask/test-bundler": "npm:^1.0.0"
-    "@metamask/test-dapp": "npm:8.7.0"
+    "@metamask/test-dapp": "npm:8.13.0"
     "@metamask/transaction-controller": "npm:^38.1.0"
     "@metamask/user-operation-controller": "npm:^13.0.0"
     "@metamask/utils": "npm:^9.3.0"

From 10102d0f025df131254dccf1a90731214ba5e589 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Wed, 6 Nov 2024 14:33:33 +0100
Subject: [PATCH 038/111] chore: e2e quality gate enhancement (#28206)
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**

With the label:

![Screenshot from 2024-10-31
12-02-14](https://github.com/user-attachments/assets/c112d2b3-4099-4bbd-bde2-1c97df04f9a4)

When removing the label:

![Screenshot from 2024-10-31
12-11-56](https://github.com/user-attachments/assets/b8591786-b91d-4a11-9f4c-ba09c9f407d5)



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

## **Related issues**

Fixes:

## **Manual testing steps**

1. See here, were we skip the git diff as it had the label
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/108789/workflows/01710cd9-1a1b-4c47-8f66-3796d57ea732/jobs/4069000

## **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**

- [ ] 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/scripts/git-diff-develop.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts
index 43435db17418..f4437d6154db 100644
--- a/.circleci/scripts/git-diff-develop.ts
+++ b/.circleci/scripts/git-diff-develop.ts
@@ -20,6 +20,7 @@ type PRInfo = {
     ref: string;
   };
   body: string;
+  labels: { name: string }[];
 };
 
 /**
@@ -123,7 +124,7 @@ async function storeGitDiffOutputAndPrBody() {
     fs.mkdirSync(CHANGED_FILES_DIR, { recursive: true });
 
     console.log(
-      `Determining whether this run is for a PR targeting ${MAIN_BRANCH}`,
+      `Determining whether to run git diff...`,
     );
     if (!PR_NUMBER) {
       console.log('Not a PR, skipping git diff');
@@ -140,6 +141,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')) {
+      console.log('PR has the skip-e2e-quality-gate label, skipping git diff');
+      return;
     }
 
     console.log('Attempting to get git diff...');

From 6a54c99301f019ab5ba7e7af5cba5390ed094651 Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:56:51 -0300
Subject: [PATCH 039/111] chore: revert commit `3da34f4` (feat: btc e2e tests
 (#27986)) (#28323)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3da34f448c9777722799d15389bdc0c83dfd28f9.


<!--
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/28323?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/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/constants.ts                         |  13 --
 test/e2e/flask/btc/btc-send.spec.ts           | 153 -----------------
 test/e2e/flask/btc/common-btc.ts              | 158 +-----------------
 .../app/wallet-overview/coin-buttons.tsx      |  26 +--
 4 files changed, 13 insertions(+), 337 deletions(-)
 delete mode 100644 test/e2e/flask/btc/btc-send.spec.ts

diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index 2e24bf4042ba..8bf39d261bcb 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -50,16 +50,3 @@ export const DEFAULT_BTC_ACCOUNT = 'bc1qg6whd6pc0cguh6gpp3ewujm53hv32ta9hdp252';
 
 /* Default (mocked) BTC balance used by the Bitcoin RPC provider */
 export const DEFAULT_BTC_BALANCE = 1; // BTC
-
-/* Default BTC fees rate */
-export const DEFAULT_BTC_FEES_RATE = 0.00001; // BTC
-
-/* Default BTC conversion rate to USD */
-export const DEFAULT_BTC_CONVERSION_RATE = 62000; // USD
-
-/* Default BTC transaction ID */
-export const DEFAULT_BTC_TRANSACTION_ID =
-  'e4111a707317da67d49a71af4cbcf6c0546f900ca32c3842d2254e315d1fca18';
-
-/* Number of sats in 1 BTC */
-export const SATS_IN_1_BTC = 100000000; // sats
diff --git a/test/e2e/flask/btc/btc-send.spec.ts b/test/e2e/flask/btc/btc-send.spec.ts
deleted file mode 100644
index c1a956cd00b7..000000000000
--- a/test/e2e/flask/btc/btc-send.spec.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { strict as assert } from 'assert';
-import { Suite } from 'mocha';
-import { Driver } from '../../webdriver/driver';
-import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
-import {
-  getTransactionRequest,
-  SendFlowPlaceHolders,
-  withBtcAccountSnap,
-} from './common-btc';
-
-export async function startSendFlow(driver: Driver, recipient?: string) {
-  // Wait a bit so the MultichainRatesController is able to fetch BTC -> USD rates.
-  await driver.delay(1000);
-
-  // Start the send flow.
-  const sendButton = await driver.waitForSelector({
-    text: 'Send',
-    tag: 'button',
-    css: '[data-testid="coin-overview-send"]',
-  });
-  await sendButton.click();
-
-  // See the review button is disabled by default.
-  await driver.waitForSelector({
-    text: 'Review',
-    tag: 'button',
-    css: '[disabled]',
-  });
-
-  if (recipient) {
-    // Set the recipient address (if any).
-    await driver.pasteIntoField(
-      `input[placeholder="${SendFlowPlaceHolders.RECIPIENT}"]`,
-      recipient,
-    );
-  }
-}
-
-describe('BTC Account - Send', function (this: Suite) {
-  it('can send complete the send flow', async function () {
-    await withBtcAccountSnap(
-      { title: this.test?.fullTitle() },
-      async (driver, mockServer) => {
-        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
-
-        // Set the amount to send.
-        const mockAmountToSend = '0.5';
-        await driver.pasteIntoField(
-          `input[placeholder="${SendFlowPlaceHolders.AMOUNT}"]`,
-          mockAmountToSend,
-        );
-
-        // From here, the "summary panel" should have some information about the fees and total.
-        await driver.waitForSelector({
-          text: 'Total',
-          tag: 'p',
-        });
-
-        // The review button will become available.
-        const snapReviewButton = await driver.findClickableElement({
-          text: 'Review',
-          tag: 'button',
-          css: '.snap-ui-renderer__footer-button',
-        });
-        assert.equal(await snapReviewButton.isEnabled(), true);
-        await snapReviewButton.click();
-
-        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
-        // We already have unit tests for these calculations on the Snap.
-
-        // ------------------------------------------------------------------------------
-        // From here, we have moved to the confirmation screen (second part of the flow).
-
-        // We should be able to send the transaction right away.
-        const snapSendButton = await driver.waitForSelector({
-          text: 'Send',
-          tag: 'button',
-          css: '.snap-ui-renderer__footer-button',
-        });
-        assert.equal(await snapSendButton.isEnabled(), true);
-        await snapSendButton.click();
-
-        // Check that we are selecting the "Activity tab" right after the send.
-        await driver.waitForSelector({
-          tag: 'div',
-          text: 'Bitcoin activity is not supported',
-        });
-
-        const transaction = await getTransactionRequest(mockServer);
-        assert(transaction !== undefined);
-      },
-    );
-  });
-
-  it('can send the max amount', async function () {
-    await withBtcAccountSnap(
-      { title: this.test?.fullTitle() },
-      async (driver, mockServer) => {
-        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
-
-        // Use the max spendable amount of that account.
-        await driver.clickElement({
-          text: 'Max',
-          tag: 'button',
-        });
-
-        // From here, the "summary panel" should have some information about the fees and total.
-        await driver.waitForSelector({
-          text: 'Total',
-          tag: 'p',
-        });
-
-        await driver.waitForSelector({
-          text: `${DEFAULT_BTC_BALANCE} BTC`,
-          tag: 'p',
-        });
-
-        // The review button will become available.
-        const snapReviewButton = await driver.findClickableElement({
-          text: 'Review',
-          tag: 'button',
-          css: '.snap-ui-renderer__footer-button',
-        });
-        assert.equal(await snapReviewButton.isEnabled(), true);
-        await snapReviewButton.click();
-
-        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
-        // We already have unit tests for these calculations on the snap.
-
-        // ------------------------------------------------------------------------------
-        // From here, we have moved to the confirmation screen (second part of the flow).
-
-        // We should be able to send the transaction right away.
-        const snapSendButton = await driver.waitForSelector({
-          text: 'Send',
-          tag: 'button',
-          css: '.snap-ui-renderer__footer-button',
-        });
-        assert.equal(await snapSendButton.isEnabled(), true);
-        await snapSendButton.click();
-
-        // Check that we are selecting the "Activity tab" right after the send.
-        await driver.waitForSelector({
-          tag: 'div',
-          text: 'Bitcoin activity is not supported',
-        });
-
-        const transaction = await getTransactionRequest(mockServer);
-        assert(transaction !== undefined);
-      },
-    );
-  });
-});
diff --git a/test/e2e/flask/btc/common-btc.ts b/test/e2e/flask/btc/common-btc.ts
index 452f9ad44f6b..6891b3bfd60e 100644
--- a/test/e2e/flask/btc/common-btc.ts
+++ b/test/e2e/flask/btc/common-btc.ts
@@ -1,26 +1,11 @@
 import { Mockttp } from 'mockttp';
 import FixtureBuilder from '../../fixture-builder';
 import { withFixtures, unlockWallet } from '../../helpers';
-import {
-  DEFAULT_BTC_ACCOUNT,
-  DEFAULT_BTC_BALANCE,
-  DEFAULT_BTC_FEES_RATE,
-  DEFAULT_BTC_TRANSACTION_ID,
-  DEFAULT_BTC_CONVERSION_RATE,
-  SATS_IN_1_BTC,
-} from '../../constants';
+import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
 import { Driver } from '../../webdriver/driver';
 import messages from '../../../../app/_locales/en/messages.json';
 
-const QUICKNODE_URL_REGEX = /^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u;
-
-export enum SendFlowPlaceHolders {
-  AMOUNT = 'Enter amount to send',
-  RECIPIENT = 'Enter receiving address',
-  LOADING = 'Preparing transaction',
-}
-
 export async function createBtcAccount(driver: Driver) {
   await driver.clickElement('[data-testid="account-menu-icon"]');
   await driver.clickElement(
@@ -42,17 +27,12 @@ export async function createBtcAccount(driver: Driver) {
   );
 }
 
-export function btcToSats(btc: number): number {
-  // Watchout, we're not using BigNumber(s) here (but that's ok for test purposes)
-  return btc * SATS_IN_1_BTC;
-}
-
 export async function mockBtcBalanceQuote(
   mockServer: Mockttp,
   address: string = DEFAULT_BTC_ACCOUNT,
 ) {
   return await mockServer
-    .forPost(QUICKNODE_URL_REGEX)
+    .forPost(/^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u)
     .withJsonBodyIncluding({
       method: 'bb_getaddress',
     })
@@ -62,7 +42,7 @@ export async function mockBtcBalanceQuote(
         json: {
           result: {
             address,
-            balance: btcToSats(DEFAULT_BTC_BALANCE).toString(), // Converts from BTC to sats
+            balance: (DEFAULT_BTC_BALANCE * 1e8).toString(), // Converts from BTC to sats
             totalReceived: '0',
             totalSent: '0',
             unconfirmedBalance: '0',
@@ -74,105 +54,6 @@ export async function mockBtcBalanceQuote(
     });
 }
 
-export async function mockBtcFeeCallQuote(mockServer: Mockttp) {
-  return await mockServer
-    .forPost(QUICKNODE_URL_REGEX)
-    .withJsonBodyIncluding({
-      method: 'estimatesmartfee',
-    })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          result: {
-            blocks: 1,
-            feerate: DEFAULT_BTC_FEES_RATE, // sats
-          },
-        },
-      };
-    });
-}
-
-export async function mockMempoolInfo(mockServer: Mockttp) {
-  return await mockServer
-    .forPost(QUICKNODE_URL_REGEX)
-    .withJsonBodyIncluding({
-      method: 'getmempoolinfo',
-    })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          result: {
-            loaded: true,
-            size: 165194,
-            bytes: 93042828,
-            usage: 550175264,
-            total_fee: 1.60127931,
-            maxmempool: 2048000000,
-            mempoolminfee: DEFAULT_BTC_FEES_RATE,
-            minrelaytxfee: DEFAULT_BTC_FEES_RATE,
-            incrementalrelayfee: 0.00001,
-            unbroadcastcount: 0,
-            fullrbf: true,
-          },
-        },
-      };
-    });
-}
-
-export async function mockGetUTXO(mockServer: Mockttp) {
-  return await mockServer
-    .forPost(QUICKNODE_URL_REGEX)
-    .withJsonBodyIncluding({
-      method: 'bb_getutxos',
-    })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          result: [
-            {
-              txid: DEFAULT_BTC_TRANSACTION_ID,
-              vout: 0,
-              value: btcToSats(DEFAULT_BTC_BALANCE).toString(),
-              height: 101100110,
-              confirmations: 6,
-            },
-          ],
-        },
-      };
-    });
-}
-
-export async function mockSendTransaction(mockServer: Mockttp) {
-  return await mockServer
-    .forPost(QUICKNODE_URL_REGEX)
-    .withJsonBodyIncluding({
-      method: 'sendrawtransaction',
-    })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          result: DEFAULT_BTC_TRANSACTION_ID,
-        },
-      };
-    });
-}
-
-export async function mockRatesCall(mockServer: Mockttp) {
-  return await mockServer
-    .forGet('https://min-api.cryptocompare.com/data/pricemulti')
-    .withQuery({ fsyms: 'btc', tsyms: 'usd,USD' })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: { BTC: { USD: DEFAULT_BTC_CONVERSION_RATE } },
-      };
-    });
-}
-
 export async function mockRampsDynamicFeatureFlag(
   mockServer: Mockttp,
   subDomain: string,
@@ -206,7 +87,7 @@ export async function withBtcAccountSnap(
     title,
     bitcoinSupportEnabled,
   }: { title?: string; bitcoinSupportEnabled?: boolean },
-  test: (driver: Driver, mockServer: Mockttp) => Promise<void>,
+  test: (driver: Driver) => Promise<void>,
 ) {
   await withFixtures(
     {
@@ -218,44 +99,17 @@ export async function withBtcAccountSnap(
       title,
       dapp: true,
       testSpecificMock: async (mockServer: Mockttp) => [
-        await mockRatesCall(mockServer),
         await mockBtcBalanceQuote(mockServer),
         // See: PROD_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'api'),
         // See: UAT_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'uat-api'),
-        await mockMempoolInfo(mockServer),
-        await mockBtcFeeCallQuote(mockServer),
-        await mockGetUTXO(mockServer),
-        await mockSendTransaction(mockServer),
       ],
     },
-    async ({ driver, mockServer }: { driver: Driver; mockServer: Mockttp }) => {
+    async ({ driver }: { driver: Driver }) => {
       await unlockWallet(driver);
       await createBtcAccount(driver);
-      await test(driver, mockServer);
-    },
-  );
-}
-
-export async function getQuickNodeSeenRequests(mockServer: Mockttp) {
-  const seenRequests = await Promise.all(
-    (
-      await mockServer.getMockedEndpoints()
-    ).map((mockedEndpoint) => mockedEndpoint.getSeenRequests()),
-  );
-  return seenRequests
-    .flat()
-    .filter((request) => request.url.match(QUICKNODE_URL_REGEX));
-}
-
-export async function getTransactionRequest(mockServer: Mockttp) {
-  // Check that the transaction has been sent.
-  const transactionRequest = (await getQuickNodeSeenRequests(mockServer)).find(
-    async (request) => {
-      const body = (await request.body.getJson()) as { method: string };
-      return body.method === 'sendrawtransaction';
+      await test(driver);
     },
   );
-  return transactionRequest;
 }
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index f49d7bf31801..bac7872c79e3 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -125,12 +125,6 @@ const CoinButtons = ({
   const account = useSelector(getSelectedAccount);
   const { address: selectedAddress } = account;
   const history = useHistory();
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  const currentActivityTabName = useSelector(
-    // @ts-expect-error TODO: fix state type
-    (state) => state.metamask.defaultHomeActiveTabName,
-  );
-  ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const location = useLocation();
   const keyring = useSelector(getCurrentKeyring);
@@ -285,20 +279,14 @@ const CoinButtons = ({
     switch (account.type) {
       ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
       case BtcAccountType.P2wpkh: {
-        try {
-          // FIXME: We switch the tab before starting the send flow (we
-          // faced some inconsistencies when changing it after).
-          await dispatch(setDefaultHomeActiveTabName('activity'));
-          await sendMultichainTransaction(
-            BITCOIN_WALLET_SNAP_ID,
-            account.id,
-            chainId as CaipChainId,
-          );
-        } catch {
-          // Restore the previous tab in case of any error (see FIXME comment above).
-          await dispatch(setDefaultHomeActiveTabName(currentActivityTabName));
-        }
+        await sendMultichainTransaction(
+          BITCOIN_WALLET_SNAP_ID,
+          account.id,
+          chainId as CaipChainId,
+        );
 
+        // We automatically switch to the activity tab once the transaction has been sent.
+        dispatch(setDefaultHomeActiveTabName('activity'));
         break;
       }
       ///: END:ONLY_INCLUDE_IF

From e5ae877fa63300d9cac9492be89e977bfa2f4418 Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:03:37 +0100
Subject: [PATCH 040/111] chore: Remove STX opt in modal (#28291)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
[This recent
PR](https://github.com/MetaMask/metamask-extension/pull/27885) enabled
STX by default for new users and only hid the STX opt in modal. The
purpose of this PR is to clean up unused code for the STX opt in modal.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Install the extension from scratch
2. Be on Ethereum mainnet and have some funds there
3. You will not see any STX opt in modal

## **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/_locales/de/messages.json                 |  22 --
 app/_locales/el/messages.json                 |  22 --
 app/_locales/en/messages.json                 |  22 --
 app/_locales/en_GB/messages.json              |  22 --
 app/_locales/es/messages.json                 |  22 --
 app/_locales/fr/messages.json                 |  22 --
 app/_locales/hi/messages.json                 |  22 --
 app/_locales/id/messages.json                 |  22 --
 app/_locales/ja/messages.json                 |  22 --
 app/_locales/ko/messages.json                 |  22 --
 app/_locales/pt/messages.json                 |  22 --
 app/_locales/ru/messages.json                 |  22 --
 app/_locales/tl/messages.json                 |  22 --
 app/_locales/tr/messages.json                 |  22 --
 app/_locales/vi/messages.json                 |  22 --
 app/_locales/zh_CN/messages.json              |  22 --
 .../preferences-controller.test.ts            |   4 +-
 .../controllers/preferences-controller.ts     |   4 +-
 app/scripts/lib/backup.test.js                |   2 +-
 shared/modules/selectors/index.test.ts        | 124 +---------
 .../modules/selectors/smart-transactions.ts   |  41 +---
 test/data/mock-state.json                     |   2 +-
 test/e2e/default-fixture.js                   |   2 +-
 test/e2e/fixture-builder.js                   |   4 +-
 test/e2e/restore/MetaMaskUserData.json        |   2 +-
 ...rs-after-init-opt-in-background-state.json |   2 +-
 .../errors-after-init-opt-in-ui-state.json    |   2 +-
 ...s-before-init-opt-in-background-state.json |   2 +-
 .../errors-before-init-opt-in-ui-state.json   |   2 +-
 .../data/integration-init-state.json          |   2 +-
 .../data/onboarding-completion-route.json     |   2 +-
 ui/ducks/metamask/metamask.js                 |   2 +-
 ui/pages/home/home.component.js               |  21 +-
 ui/pages/home/home.container.js               |   4 -
 .../advanced-tab.component.test.js.snap       |  12 +-
 ...rt-transactions-opt-in-modal.test.tsx.snap |   3 -
 .../smart-transactions/components/index.scss  |  26 ---
 .../smart-transactions-opt-in-modal.test.tsx  |  70 ------
 .../smart-transactions-opt-in-modal.tsx       | 219 ------------------
 ui/pages/smart-transactions/index.scss        |   1 -
 40 files changed, 31 insertions(+), 876 deletions(-)
 delete mode 100644 ui/pages/smart-transactions/components/__snapshots__/smart-transactions-opt-in-modal.test.tsx.snap
 delete mode 100644 ui/pages/smart-transactions/components/index.scss
 delete mode 100644 ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.test.tsx
 delete mode 100644 ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.tsx

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 9af24022bcb3..771deef4c28c 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Beschleunigung der Gasgebühr bearbeiten"
   },
-  "enable": {
-    "message": "Aktivieren"
-  },
   "enableAutoDetect": {
     "message": " Automatische Erkennung aktivieren"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Smart Transactions"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Erfolgsrate: 99,5 %"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Spart Ihnen Geld"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Updates in Echtzeit"
-  },
-  "smartTransactionsDescription": {
-    "message": "Erzielen Sie mit Smart Transactions höhere Erfolgsraten, einen Frontrunning-Schutz und eine bessere Transparenz."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Nur auf Ethereum verfügbar. Sie können diese Funktion jederzeit in den Einstellungen aktivieren oder deaktivieren. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Verbesserter Transaktionsschutz"
-  },
   "snapAccountCreated": {
     "message": "Konto erstellt"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 308099b1c2b1..7ae594c8b9b8 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Επεξεργασία τελών επίσπευσης συναλλαγής"
   },
-  "enable": {
-    "message": "Ενεργοποίηση"
-  },
   "enableAutoDetect": {
     "message": " Ενεργοποίηση αυτόματου εντοπισμού"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Έξυπνες συναλλαγές"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Ποσοστό επιτυχίας 99,5%"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Σας εξοικονομεί χρήματα"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Ενημερώσεις σε πραγματικό χρόνο"
-  },
-  "smartTransactionsDescription": {
-    "message": "Ξεκλειδώστε υψηλότερα ποσοστά επιτυχίας, προστασία σε \"προπορευόμενες συναλλαγές\" και καλύτερη ορατότητα με τις Έξυπνες Συναλλαγές."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Διατίθεται μόνο στο Ethereum. Ενεργοποιήστε ή απενεργοποιήστε το ανά πάσα στιγμή στις ρυθμίσεις. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Ενισχυμένη Προστασία Συναλλαγών"
-  },
   "snapAccountCreated": {
     "message": "Ο λογαριασμός δημιουργήθηκε"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 409965f07ab9..ab6b06411731 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1849,9 +1849,6 @@
   "editSpendingCapSpecialCharError": {
     "message": "Enter numbers only"
   },
-  "enable": {
-    "message": "Enable"
-  },
   "enableAutoDetect": {
     "message": " Enable autodetect"
   },
@@ -5064,25 +5061,6 @@
   "smartTransactions": {
     "message": "Smart Transactions"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5% success rate"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Saves you money"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Real-time updates"
-  },
-  "smartTransactionsDescription": {
-    "message": "Unlock higher success rates, frontrunning protection, and better visibility with Smart Transactions."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Only available on Ethereum. Enable or disable any time in settings. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Enhanced Transaction Protection"
-  },
   "snapAccountCreated": {
     "message": "Account created"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index fc635e33a708..e8eb1e58ea71 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -1707,9 +1707,6 @@
   "effortlesslyNavigateYourDigitalAssets": {
     "message": "Effortlessly navigate your digital assets"
   },
-  "enable": {
-    "message": "Enable"
-  },
   "enableAutoDetect": {
     "message": " Enable autodetect"
   },
@@ -4815,25 +4812,6 @@
   "smartTransactions": {
     "message": "Smart Transactions"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5% success rate"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Saves you money"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Real-time updates"
-  },
-  "smartTransactionsDescription": {
-    "message": "Unlock higher success rates, frontrunning protection, and better visibility with Smart Transactions."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Only available on Ethereum. Enable or disable any time in settings. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Enhanced Transaction Protection"
-  },
   "snapAccountCreated": {
     "message": "Account created"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index ada162b9a12b..0f774d8f6ba2 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1617,9 +1617,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Editar la tarifa de aceleración de gas"
   },
-  "enable": {
-    "message": "Habilitar"
-  },
   "enableAutoDetect": {
     "message": " Activar autodetección"
   },
@@ -4634,25 +4631,6 @@
   "smartTransactions": {
     "message": "Transacciones inteligentes"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Índice de éxito del 99.5%"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Le permite ahorrar dinero"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Actualizaciones en tiempo real"
-  },
-  "smartTransactionsDescription": {
-    "message": "Desbloquee índices de éxito más altos, protección contra frontrunning y mejor visibilidad con transacciones inteligentes."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Solo disponible en Ethereum. Active o desactive en cualquier momento en la configuración. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Protección mejorada de transacciones"
-  },
   "snapAccountCreated": {
     "message": "Cuenta creada"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 856638ba2b8a..985dfd44c9dd 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Modifier les gas fees d’accélération"
   },
-  "enable": {
-    "message": "Activer"
-  },
   "enableAutoDetect": {
     "message": " Activer la détection automatique"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Transactions intelligentes"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Taux de réussite de 99,5 %"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Cela vous permet d’économiser de l’argent"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Mises à jour en temps réel"
-  },
-  "smartTransactionsDescription": {
-    "message": "Bénéficiez de taux de réussite plus élevés, d’une protection contre le « front running » et d’une meilleure visibilité grâce aux transactions intelligentes."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Disponible uniquement sur Ethereum. Vous pouvez activer ou désactiver cette option à tout moment dans les paramètres. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Protection renforcée des transactions"
-  },
   "snapAccountCreated": {
     "message": "Le compte a été créé"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 45e64a972e17..540023a75fac 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "गैस फ़ीस स्पीड अप को बदलें"
   },
-  "enable": {
-    "message": "चालू करें"
-  },
   "enableAutoDetect": {
     "message": " ऑटो डिटेक्ट इनेबल करें"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "स्मार्ट ट्रांसेक्शन"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5% सफलता दर"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "आपका पैसा बचाता है"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "रियल-टाइम अपडेट"
-  },
-  "smartTransactionsDescription": {
-    "message": "स्मार्ट ट्रांसेक्शन के साथ उच्च सफलता दर, फ्रंटरनिंग सुरक्षा और बेहतर दृश्यता अनलॉक करें।"
-  },
-  "smartTransactionsDescription2": {
-    "message": "केवल Ethereum पर उपलब्ध है। सेटिंग्स में किसी भी समय चालू करें या बंद करें। $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "एनहांस्ड ट्रांसेक्शन प्रोटेक्शन"
-  },
   "snapAccountCreated": {
     "message": "अकाउंट बनाया गया"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 6314d9ed3468..81f7d2a9c633 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Edit biaya gas percepatan"
   },
-  "enable": {
-    "message": "Aktifkan"
-  },
   "enableAutoDetect": {
     "message": " Aktifkan deteksi otomatis"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Transaksi Pintar"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Tingkat keberhasilan 99,5%"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Menghemat uang Anda"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Pembaruan waktu nyata"
-  },
-  "smartTransactionsDescription": {
-    "message": "Raih tingkat keberhasilan yang lebih tinggi, perlindungan frontrunning, dan visibilitas yang lebih baik dengan Transaksi Pintar."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Hanya tersedia di Ethereum. Aktifkan atau nonaktifkan kapan saja di pengaturan. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Peningkatan Perlindungan Transaksi"
-  },
   "snapAccountCreated": {
     "message": "Akun dibuat"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 61730b2bc325..5787bb88c397 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "高速化用のガス代を編集"
   },
-  "enable": {
-    "message": "有効にする"
-  },
   "enableAutoDetect": {
     "message": " 自動検出を有効にする"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "スマートトランザクション"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5%の成功率"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "お金を節約できます"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "リアルタイムの最新情報"
-  },
-  "smartTransactionsDescription": {
-    "message": "スマートトランザクションで、成功率を上げ、フロントランニングを防ぎ、可視性を高めましょう。"
-  },
-  "smartTransactionsDescription2": {
-    "message": "イーサリアムでのみご利用いただけ、いつでも設定で有効・無効を切り替えられます。$1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "強化されたトランザクション保護"
-  },
   "snapAccountCreated": {
     "message": "アカウントが作成されました"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 05c04fbd17a9..32d7bd4399b5 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "가스비 가속 편집"
   },
-  "enable": {
-    "message": "활성화"
-  },
   "enableAutoDetect": {
     "message": " 자동 감지 활성화"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "스마트 트랜잭션"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5% 성공률"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "비용 절감"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "실시간 업데이트"
-  },
-  "smartTransactionsDescription": {
-    "message": "스마트 트랜잭션으로 선행거래를 방지하고 더 높은 성공률과 가시성을 확보하세요."
-  },
-  "smartTransactionsDescription2": {
-    "message": "이더리움에서만 사용할 수 있습니다. 설정에서 언제든지 활성화하거나 비활성화할 수 있습니다. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "트랜잭션 보호 강화"
-  },
   "snapAccountCreated": {
     "message": "계정 생성됨"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 4c02a9dc223e..4eecb941d36f 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Editar taxa de gás para aceleração"
   },
-  "enable": {
-    "message": "Ativar"
-  },
   "enableAutoDetect": {
     "message": " Ativar detecção automática"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Transações inteligentes"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99,5% de taxa de sucesso"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Faz você economizar dinheiro"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Atualizações em tempo real"
-  },
-  "smartTransactionsDescription": {
-    "message": "Desbloqueie taxas de sucesso maiores, proteção contra front running e melhor visibilidade com as transações inteligentes."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Disponível somente na Ethereum. Ative ou desative a qualquer momento nas configurações. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Proteção de transações aprimorada"
-  },
   "snapAccountCreated": {
     "message": "Conta criada"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index f1e5d27589c5..ce53cc239de5 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Изменить плату за газ за ускорение"
   },
-  "enable": {
-    "message": "Включить"
-  },
   "enableAutoDetect": {
     "message": " Включить автоопределение"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Умные транзакции"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Коэффициент успеха 99,5%"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Экономит вам деньги"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Обновления в реальном времени"
-  },
-  "smartTransactionsDescription": {
-    "message": "Откройте для себя более высокие коэффициенты успеха, передовую защиту и лучшую прозрачность с помощью умных транзакций."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Доступно только на Ethereum. Включайте или отключайте в любое время в настройках. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Улучшенная защита транзакций"
-  },
   "snapAccountCreated": {
     "message": "Счет создан"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 76e91829fc2c..8909ac662e34 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "I-edit ang pagpapabilis ng bayad sa gas"
   },
-  "enable": {
-    "message": "Payagan"
-  },
   "enableAutoDetect": {
     "message": " Paganahin ang autodetect"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Mga Smart Transaction"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5% tiyansa ng tagumpay"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Makatitipid ng pera"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Mga real-time na update"
-  },
-  "smartTransactionsDescription": {
-    "message": "Mag-unlock na mas mataas na tiyansa ng tagumpay, proteksyon sa frontrunning, at mas mahusay na visibility sa mga Smart Transaction."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Available lamang sa Ethereum. I-enable o i-disable anumang oras sa mga setting. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Pinahusay na Proteksyon sa Transaksyon"
-  },
   "snapAccountCreated": {
     "message": "Nagawa ang account"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 3b1899614d70..8c4e44d3192e 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Hızlandırma gaz ücretini düzenle"
   },
-  "enable": {
-    "message": "Etkinleştir"
-  },
   "enableAutoDetect": {
     "message": " Otomatik algılamayı etkinleştir"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Akıllı İşlemler"
   },
-  "smartTransactionsBenefit1": {
-    "message": "%99,5 başarı oranı"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Paradan tasarruf sağlar"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Gerçek zamanlı güncellemeler"
-  },
-  "smartTransactionsDescription": {
-    "message": "Akıllı İşlemler ile daha yüksek başarı oranlarının, arkadan çalıştırma korumasının ve daha iyi görünürlüğün kilidini açın."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Sadece Ethereum'da mevcuttur. Dilediğiniz zaman ayarlar kısmında etkinleştirin veya devre dışı bırakın. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "İyileştirilmiş İşlem Koruması"
-  },
   "snapAccountCreated": {
     "message": "Hesap oluşturuldu"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 4bfcba6dac1f..b741fe6eb536 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "Chỉnh sửa phí gas tăng tốc"
   },
-  "enable": {
-    "message": "Bật"
-  },
   "enableAutoDetect": {
     "message": " Bật tự động phát hiện"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "Giao dịch thông minh"
   },
-  "smartTransactionsBenefit1": {
-    "message": "Tỷ lệ thành công 99,5%"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "Tiết kiệm tiền của bạn"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "Cập nhật theo thời gian thực"
-  },
-  "smartTransactionsDescription": {
-    "message": "Đạt tỷ lệ thành công cao hơn, bảo vệ chống hành vi lợi dụng thông tin biết trước và khả năng hiển thị tốt hơn với Giao dịch thông minh."
-  },
-  "smartTransactionsDescription2": {
-    "message": "Chỉ có sẵn trên Ethereum. Có thể bật/tắt bất cứ lúc nào trong phần Cài đặt. $1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "Tăng cường bảo vệ giao dịch"
-  },
   "snapAccountCreated": {
     "message": "Tài khoản đã được tạo"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 80a31d532482..e5695cdfaecf 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1620,9 +1620,6 @@
   "editSpeedUpEditGasFeeModalTitle": {
     "message": "编辑加速燃料费用"
   },
-  "enable": {
-    "message": "启用"
-  },
   "enableAutoDetect": {
     "message": " 启用自动检测"
   },
@@ -4637,25 +4634,6 @@
   "smartTransactions": {
     "message": "智能交易"
   },
-  "smartTransactionsBenefit1": {
-    "message": "99.5%的成功率"
-  },
-  "smartTransactionsBenefit2": {
-    "message": "为您省钱"
-  },
-  "smartTransactionsBenefit3": {
-    "message": "实时更新"
-  },
-  "smartTransactionsDescription": {
-    "message": "通过智能交易解锁更高的成功率、抢先交易保护和更高的透明度。"
-  },
-  "smartTransactionsDescription2": {
-    "message": "仅适用于以太坊。可随时在设置中启用或禁用。$1",
-    "description": "$1 is an external link to learn more about Smart Transactions"
-  },
-  "smartTransactionsOptItModalTitle": {
-    "message": "增强型交易保护"
-  },
   "snapAccountCreated": {
     "message": "账户已创建"
   },
diff --git a/app/scripts/controllers/preferences-controller.test.ts b/app/scripts/controllers/preferences-controller.test.ts
index a4b91a8d3b1a..25010cdd3a0f 100644
--- a/app/scripts/controllers/preferences-controller.test.ts
+++ b/app/scripts/controllers/preferences-controller.test.ts
@@ -733,7 +733,7 @@ describe('preferences controller', () => {
         privacyMode: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
-        smartTransactionsOptInStatus: null,
+        smartTransactionsOptInStatus: true,
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
@@ -762,7 +762,7 @@ describe('preferences controller', () => {
         showExtensionInFullSizeView: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
-        smartTransactionsOptInStatus: null,
+        smartTransactionsOptInStatus: true,
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index e1cdb2e8a4f6..bc7d03155f75 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -103,7 +103,7 @@ export type Preferences = {
   showExtensionInFullSizeView: boolean;
   showFiatInTestnets: boolean;
   showTestNetworks: boolean;
-  smartTransactionsOptInStatus: boolean | null;
+  smartTransactionsOptInStatus: boolean;
   showNativeTokenAsMainBalance: boolean;
   useNativeCurrencyAsPrimaryCurrency: boolean;
   hideZeroBalanceTokens: boolean;
@@ -209,7 +209,7 @@ export const getDefaultPreferencesControllerState =
       showExtensionInFullSizeView: false,
       showFiatInTestnets: false,
       showTestNetworks: false,
-      smartTransactionsOptInStatus: null, // null means we will show the Smart Transactions opt-in modal to a user if they are eligible
+      smartTransactionsOptInStatus: true,
       showNativeTokenAsMainBalance: false,
       useNativeCurrencyAsPrimaryCurrency: true,
       hideZeroBalanceTokens: false,
diff --git a/app/scripts/lib/backup.test.js b/app/scripts/lib/backup.test.js
index 7a322148c847..b3a7f176c2e6 100644
--- a/app/scripts/lib/backup.test.js
+++ b/app/scripts/lib/backup.test.js
@@ -165,7 +165,7 @@ const jsonData = JSON.stringify({
       showExtensionInFullSizeView: false,
       showFiatInTestnets: false,
       showTestNetworks: true,
-      smartTransactionsOptInStatus: false,
+      smartTransactionsOptInStatus: true,
       useNativeCurrencyAsPrimaryCurrency: true,
       showMultiRpcModal: false,
     },
diff --git a/shared/modules/selectors/index.test.ts b/shared/modules/selectors/index.test.ts
index 9f0b1b201a5c..2e40d47db102 100644
--- a/shared/modules/selectors/index.test.ts
+++ b/shared/modules/selectors/index.test.ts
@@ -9,7 +9,6 @@ import {
   getCurrentChainSupportsSmartTransactions,
   getSmartTransactionsEnabled,
   getIsSmartTransaction,
-  getIsSmartTransactionsOptInModalAvailable,
   getSmartTransactionsPreferenceEnabled,
 } from '.';
 
@@ -70,7 +69,7 @@ describe('Selectors', () => {
   };
 
   describe('getSmartTransactionsOptInStatusForMetrics and getSmartTransactionsPreferenceEnabled', () => {
-    const createMockOptInStatusState = (status: boolean | null) => {
+    const createMockOptInStatusState = (status: boolean) => {
       return {
         metamask: {
           preferences: {
@@ -89,7 +88,6 @@ describe('Selectors', () => {
       jestIt.each([
         { status: true, expected: true },
         { status: false, expected: false },
-        { status: null, expected: null },
       ])(
         'should return $expected if the smart transactions opt-in status is $status',
         ({ status, expected }) => {
@@ -113,7 +111,6 @@ describe('Selectors', () => {
       jestIt.each([
         { status: true, expected: true },
         { status: false, expected: false },
-        { status: null, expected: true },
       ])(
         'should return $expected if the smart transactions opt-in status is $status',
         ({ status, expected }) => {
@@ -316,123 +313,4 @@ describe('Selectors', () => {
       expect(result).toBe(false);
     });
   });
-
-  describe('getIsSmartTransactionsOptInModalAvailable', () => {
-    jestIt(
-      'returns true for Ethereum Mainnet + supported RPC URL + null opt-in status and non-zero balance',
-      () => {
-        const state = createMockState();
-        const newState = {
-          ...state,
-          metamask: {
-            ...state.metamask,
-            preferences: {
-              ...state.metamask.preferences,
-              smartTransactionsOptInStatus: null,
-            },
-          },
-        };
-        expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(true);
-      },
-    );
-
-    jestIt(
-      'returns false for Polygon Mainnet + supported RPC URL + null opt-in status and non-zero balance',
-      () => {
-        const state = createMockState();
-        const newState = {
-          ...state,
-          metamask: {
-            ...state.metamask,
-            preferences: {
-              ...state.metamask.preferences,
-              smartTransactionsOptInStatus: null,
-            },
-            ...mockNetworkState({ chainId: CHAIN_IDS.POLYGON }),
-          },
-        };
-        expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
-      },
-    );
-
-    jestIt(
-      'returns false for Ethereum Mainnet + unsupported RPC URL + null opt-in status and non-zero balance',
-      () => {
-        const state = createMockState();
-        const newState = {
-          ...state,
-          metamask: {
-            ...state.metamask,
-            preferences: {
-              ...state.metamask.preferences,
-              smartTransactionsOptInStatus: null,
-            },
-            ...mockNetworkState({
-              chainId: CHAIN_IDS.MAINNET,
-              rpcUrl: 'https://mainnet.quiknode.pro/',
-            }),
-          },
-        };
-        expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
-      },
-    );
-
-    jestIt(
-      'returns false for Ethereum Mainnet + supported RPC URL + true opt-in status and non-zero balance',
-      () => {
-        const state = createMockState();
-        expect(getIsSmartTransactionsOptInModalAvailable(state)).toBe(false);
-      },
-    );
-
-    jestIt(
-      'returns false for Ethereum Mainnet + supported RPC URL + null opt-in status and zero balance (0x0)',
-      () => {
-        const state = createMockState();
-        const newState = {
-          ...state,
-          metamask: {
-            ...state.metamask,
-            preferences: {
-              ...state.metamask.preferences,
-              smartTransactionsOptInStatus: null,
-            },
-            accounts: {
-              ...state.metamask.accounts,
-              '0x123': {
-                address: '0x123',
-                balance: '0x0',
-              },
-            },
-          },
-        };
-        expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
-      },
-    );
-
-    jestIt(
-      'returns false for Ethereum Mainnet + supported RPC URL + null opt-in status and zero balance (0x00)',
-      () => {
-        const state = createMockState();
-        const newState = {
-          ...state,
-          metamask: {
-            ...state.metamask,
-            preferences: {
-              ...state.metamask.preferences,
-              smartTransactionsOptInStatus: null,
-            },
-            accounts: {
-              ...state.metamask.accounts,
-              '0x123': {
-                address: '0x123',
-                balance: '0x00',
-              },
-            },
-          },
-        };
-        expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
-      },
-    );
-  });
 });
diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
index a02fe63692b3..4fb6d56fc87d 100644
--- a/shared/modules/selectors/smart-transactions.ts
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -7,21 +7,16 @@ import {
   getCurrentChainId,
   getCurrentNetwork,
   accountSupportsSmartTx,
-  getSelectedAccount,
   getPreferences,
   // TODO: Remove restricted import
   // eslint-disable-next-line import/no-restricted-paths
 } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
 import { isProduction } from '../environment';
 
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import { MultichainState } from '../../../ui/selectors/multichain';
-
 type SmartTransactionsMetaMaskState = {
   metamask: {
     preferences: {
-      smartTransactionsOptInStatus?: boolean | null;
+      smartTransactionsOptInStatus?: boolean;
     };
     internalAccounts: {
       selectedAccount: string;
@@ -72,10 +67,8 @@ type SmartTransactionsMetaMaskState = {
  */
 export const getSmartTransactionsOptInStatusInternal = createSelector(
   getPreferences,
-  (preferences: {
-    smartTransactionsOptInStatus?: boolean | null;
-  }): boolean | null => {
-    return preferences?.smartTransactionsOptInStatus ?? null;
+  (preferences: { smartTransactionsOptInStatus?: boolean }): boolean => {
+    return preferences?.smartTransactionsOptInStatus ?? true;
   },
 );
 
@@ -93,7 +86,7 @@ export const getSmartTransactionsOptInStatusInternal = createSelector(
  */
 export const getSmartTransactionsOptInStatusForMetrics = createSelector(
   getSmartTransactionsOptInStatusInternal,
-  (optInStatus: boolean | null): boolean | null => optInStatus,
+  (optInStatus: boolean): boolean => optInStatus,
 );
 
 /**
@@ -105,7 +98,7 @@ export const getSmartTransactionsOptInStatusForMetrics = createSelector(
  */
 export const getSmartTransactionsPreferenceEnabled = createSelector(
   getSmartTransactionsOptInStatusInternal,
-  (optInStatus: boolean | null): boolean => {
+  (optInStatus: boolean): boolean => {
     // In the absence of an explicit opt-in or opt-out,
     // the Smart Transactions toggle is enabled.
     const DEFAULT_SMART_TRANSACTIONS_ENABLED = true;
@@ -137,30 +130,6 @@ const getIsAllowedRpcUrlForSmartTransactions = (
   return rpcUrl?.hostname?.endsWith('.infura.io');
 };
 
-/**
- * Checks if the selected account has a non-zero balance.
- *
- * @param state - The state object containing account information.
- * @returns true if the selected account has a non-zero balance, otherwise false.
- */
-const hasNonZeroBalance = (state: SmartTransactionsMetaMaskState) => {
-  const selectedAccount = getSelectedAccount(
-    state as unknown as MultichainState,
-  );
-  return BigInt(selectedAccount?.balance || '0x0') > 0n;
-};
-
-export const getIsSmartTransactionsOptInModalAvailable = (
-  state: SmartTransactionsMetaMaskState,
-) => {
-  return (
-    getCurrentChainSupportsSmartTransactions(state) &&
-    getIsAllowedRpcUrlForSmartTransactions(state) &&
-    getSmartTransactionsOptInStatusInternal(state) === null &&
-    hasNonZeroBalance(state)
-  );
-};
-
 export const getSmartTransactionsEnabled = (
   state: SmartTransactionsMetaMaskState,
 ): boolean => {
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 2865478912f3..184787b07836 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -372,7 +372,7 @@
       "showFiatInTestnets": false,
       "showNativeTokenAsMainBalance": true,
       "showTestNetworks": true,
-      "smartTransactionsOptInStatus": false,
+      "smartTransactionsOptInStatus": true,
       "tokenSortConfig": {
         "key": "tokenFiatAmount",
         "order": "dsc",
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index 95f35bf1694c..2d3d2999ed43 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -212,7 +212,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
           showTestNetworks: false,
-          smartTransactionsOptInStatus: false,
+          smartTransactionsOptInStatus: true,
           showNativeTokenAsMainBalance: true,
           petnamesEnabled: true,
           showMultiRpcModal: false,
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 4d7e1873bff4..334e2f74ceca 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -77,7 +77,7 @@ function onboardingFixture() {
           showFiatInTestnets: false,
           privacyMode: false,
           showTestNetworks: false,
-          smartTransactionsOptInStatus: false,
+          smartTransactionsOptInStatus: true,
           showNativeTokenAsMainBalance: true,
           petnamesEnabled: true,
           showMultiRpcModal: false,
@@ -124,7 +124,7 @@ function onboardingFixture() {
           [ETHERSCAN_SUPPORTED_CHAIN_IDS.GNOSIS]: true,
         },
         showTestNetworks: false,
-        smartTransactionsOptInStatus: false,
+        smartTransactionsOptInStatus: true,
       },
       QueuedRequestController: {
         queuedRequestCount: 0,
diff --git a/test/e2e/restore/MetaMaskUserData.json b/test/e2e/restore/MetaMaskUserData.json
index 846acc8164cd..7a687ec254c0 100644
--- a/test/e2e/restore/MetaMaskUserData.json
+++ b/test/e2e/restore/MetaMaskUserData.json
@@ -36,7 +36,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
-      "smartTransactionsOptInStatus": false
+      "smartTransactionsOptInStatus": true
     },
     "theme": "light",
     "useBlockie": false,
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 6d77cd3ae351..1a871780591f 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
@@ -224,7 +224,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
-      "smartTransactionsOptInStatus": false,
+      "smartTransactionsOptInStatus": true,
       "showNativeTokenAsMainBalance": true,
       "petnamesEnabled": true,
       "showMultiRpcModal": "boolean",
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 e577bb71a6be..e8f8f81a6293 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
@@ -30,7 +30,7 @@
       "showExtensionInFullSizeView": false,
       "showFiatInTestnets": false,
       "showTestNetworks": false,
-      "smartTransactionsOptInStatus": false,
+      "smartTransactionsOptInStatus": true,
       "showNativeTokenAsMainBalance": true,
       "petnamesEnabled": true,
       "showMultiRpcModal": "boolean",
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 89b1b29100bb..1a51023a2ca1 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
@@ -128,7 +128,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
-        "smartTransactionsOptInStatus": false,
+        "smartTransactionsOptInStatus": true,
         "showNativeTokenAsMainBalance": true,
         "petnamesEnabled": true,
         "isRedesignedConfirmationsDeveloperEnabled": "boolean",
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 f13d3e078c64..bf7f87a16134 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
@@ -128,7 +128,7 @@
         "showExtensionInFullSizeView": false,
         "showFiatInTestnets": false,
         "showTestNetworks": false,
-        "smartTransactionsOptInStatus": false,
+        "smartTransactionsOptInStatus": true,
         "showNativeTokenAsMainBalance": true,
         "petnamesEnabled": true,
         "isRedesignedConfirmationsDeveloperEnabled": "boolean",
diff --git a/test/integration/data/integration-init-state.json b/test/integration/data/integration-init-state.json
index 7949e19cfa51..a0ae3a8fb146 100644
--- a/test/integration/data/integration-init-state.json
+++ b/test/integration/data/integration-init-state.json
@@ -781,7 +781,7 @@
     "showExtensionInFullSizeView": false,
     "showFiatInTestnets": false,
     "showTestNetworks": true,
-    "smartTransactionsOptInStatus": false,
+    "smartTransactionsOptInStatus": true,
     "petnamesEnabled": false,
     "showConfirmationAdvancedDetails": false,
     "showMultiRpcModal": false
diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
index e47d1379b2eb..b2c19536a138 100644
--- a/test/integration/data/onboarding-completion-route.json
+++ b/test/integration/data/onboarding-completion-route.json
@@ -223,7 +223,7 @@
     "showExtensionInFullSizeView": false,
     "showFiatInTestnets": false,
     "showTestNetworks": false,
-    "smartTransactionsOptInStatus": null,
+    "smartTransactionsOptInStatus": true,
     "hideZeroBalanceTokens": false,
     "petnamesEnabled": true,
     "redesignedConfirmationsEnabled": true,
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 9627608eb709..63ff92a11ccc 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -47,7 +47,7 @@ const initialState = {
     showExtensionInFullSizeView: false,
     showFiatInTestnets: false,
     showTestNetworks: false,
-    smartTransactionsOptInStatus: false,
+    smartTransactionsOptInStatus: true,
     petnamesEnabled: true,
     featureNotificationsEnabled: false,
     privacyMode: false,
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 37c147427ac5..9ac71dd6a766 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -13,7 +13,6 @@ import TermsOfUsePopup from '../../components/app/terms-of-use-popup';
 import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
 import WhatsNewPopup from '../../components/app/whats-new-popup';
 import { FirstTimeFlowType } from '../../../shared/constants/onboarding';
-import SmartTransactionsOptInModal from '../smart-transactions/components/smart-transactions-opt-in-modal';
 ///: END:ONLY_INCLUDE_IF
 import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
@@ -155,7 +154,6 @@ export default class Home extends PureComponent {
     hideWhatsNewPopup: PropTypes.func.isRequired,
     announcementsToShow: PropTypes.bool.isRequired,
     onboardedInThisUISession: PropTypes.bool,
-    isSmartTransactionsOptInModalAvailable: PropTypes.bool.isRequired,
     showMultiRpcModal: PropTypes.bool.isRequired,
     ///: END:ONLY_INCLUDE_IF
     newNetworkAddedConfigurationId: PropTypes.string,
@@ -937,7 +935,6 @@ export default class Home extends PureComponent {
       announcementsToShow,
       firstTimeFlowType,
       newNetworkAddedConfigurationId,
-      isSmartTransactionsOptInModalAvailable,
       showMultiRpcModal,
       ///: END:ONLY_INCLUDE_IF
     } = this.props;
@@ -956,20 +953,11 @@ export default class Home extends PureComponent {
       !process.env.IN_TEST &&
       !newNetworkAddedConfigurationId;
 
-    const showSmartTransactionsOptInModal =
-      canSeeModals && isSmartTransactionsOptInModalAvailable;
-
     const showWhatsNew =
-      canSeeModals &&
-      announcementsToShow &&
-      showWhatsNewPopup &&
-      !showSmartTransactionsOptInModal;
+      canSeeModals && announcementsToShow && showWhatsNewPopup;
 
     const showMultiRpcEditModal =
-      canSeeModals &&
-      showMultiRpcModal &&
-      !showSmartTransactionsOptInModal &&
-      !showWhatsNew;
+      canSeeModals && showMultiRpcModal && !showWhatsNew;
 
     const showTermsOfUse =
       completedOnboarding && !onboardedInThisUISession && showTermsOfUsePopup;
@@ -991,11 +979,6 @@ export default class Home extends PureComponent {
           {
             ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
           }
-          <SmartTransactionsOptInModal
-            isOpen={showSmartTransactionsOptInModal}
-            hideWhatsNewPopup={hideWhatsNewPopup}
-          />
-
           {showMultiRpcEditModal && <MultiRpcEditModal />}
           {showWhatsNew ? <WhatsNewPopup onClose={hideWhatsNewPopup} /> : null}
           {!showWhatsNew && showRecoveryPhraseReminder ? (
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index dfeb1a5e7cdb..9d4511021529 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -222,10 +222,6 @@ const mapStateToProps = (state) => {
     custodianDeepLink: getCustodianDeepLink(state),
     accountType: getAccountType(state),
     ///: END:ONLY_INCLUDE_IF
-
-    // Set to false to prevent the opt-in modal from showing.
-    // TODO(dbrans): Remove opt-in modal once default opt-in is stable.
-    isSmartTransactionsOptInModalAvailable: false,
     showMultiRpcModal: state.metamask.preferences.showMultiRpcModal,
   };
 };
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 e914c54fe4ca..1bbfe6d81743 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
@@ -99,34 +99,34 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         class="settings-page__content-item-col"
       >
         <label
-          class="toggle-button toggle-button--off"
+          class="toggle-button toggle-button--on"
           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(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(67, 174, 252);"
             >
               <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;"
+                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: 1; 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;"
+                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: 0;"
               />
             </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;"
+                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: 18px;"
               />
             </div>
             <input
               data-testid="settings-page-stx-opt-in-toggle"
               style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
               type="checkbox"
-              value="false"
+              value="true"
             />
           </div>
           <div
diff --git a/ui/pages/smart-transactions/components/__snapshots__/smart-transactions-opt-in-modal.test.tsx.snap b/ui/pages/smart-transactions/components/__snapshots__/smart-transactions-opt-in-modal.test.tsx.snap
deleted file mode 100644
index cdd10e5d38fb..000000000000
--- a/ui/pages/smart-transactions/components/__snapshots__/smart-transactions-opt-in-modal.test.tsx.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SmartTransactionsOptInModal displays the correct text in the modal 1`] = `<div />`;
diff --git a/ui/pages/smart-transactions/components/index.scss b/ui/pages/smart-transactions/components/index.scss
deleted file mode 100644
index c7c6ae34efe1..000000000000
--- a/ui/pages/smart-transactions/components/index.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.mm-smart-transactions-opt-in-modal {
-  &__benefit {
-    flex: 1;
-  }
-
-  &__icon {
-    --size: 40px;
-  }
-
-  &__no-thanks-link {
-    opacity: 75%;
-
-    &:hover {
-      color: var(--color-text-alternative) !important;
-      text-decoration: none !important;
-    }
-  }
-
-  .mm-modal-content {
-    &__dialog {
-      background-image: url('/images/smart-transactions/smart-transactions-opt-in-background.svg');
-      background-position: -80px 16px;
-      background-repeat: no-repeat;
-    }
-  }
-}
diff --git a/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.test.tsx b/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.test.tsx
deleted file mode 100644
index ab491ea05ea5..000000000000
--- a/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.test.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react';
-import { fireEvent } from '@testing-library/react';
-import thunk from 'redux-thunk';
-import configureMockStore from 'redux-mock-store';
-
-import {
-  renderWithProvider,
-  createSwapsMockStore,
-} from '../../../../test/jest';
-import { setSmartTransactionsPreferenceEnabled } from '../../../store/actions';
-import SmartTransactionsOptInModal from './smart-transactions-opt-in-modal';
-
-const middleware = [thunk];
-
-jest.mock('../../../store/actions');
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useHistory: jest.fn(() => []),
-}));
-
-describe('SmartTransactionsOptInModal', () => {
-  it('displays the correct text in the modal', () => {
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const { getByText, container } = renderWithProvider(
-      <SmartTransactionsOptInModal
-        isOpen={true}
-        hideWhatsNewPopup={jest.fn()}
-      />,
-      store,
-    );
-    expect(getByText('Enable')).toBeInTheDocument();
-    expect(getByText('No thanks')).toBeInTheDocument();
-    expect(container).toMatchSnapshot();
-  });
-
-  it('calls setSmartTransactionsOptInStatus with false when the "No thanks" link is clicked', () => {
-    (setSmartTransactionsPreferenceEnabled as jest.Mock).mockImplementationOnce(
-      () => jest.fn(),
-    );
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const { getByText } = renderWithProvider(
-      <SmartTransactionsOptInModal
-        isOpen={true}
-        hideWhatsNewPopup={jest.fn()}
-      />,
-      store,
-    );
-    const noThanksLink = getByText('No thanks');
-    fireEvent.click(noThanksLink);
-    expect(setSmartTransactionsPreferenceEnabled).toHaveBeenCalledWith(false);
-  });
-
-  it('calls setSmartTransactionsOptInStatus with true when the "Enable" button is clicked', () => {
-    (setSmartTransactionsPreferenceEnabled as jest.Mock).mockImplementationOnce(
-      () => jest.fn(),
-    );
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const { getByText } = renderWithProvider(
-      <SmartTransactionsOptInModal
-        isOpen={true}
-        hideWhatsNewPopup={jest.fn()}
-      />,
-      store,
-    );
-    const enableButton = getByText('Enable');
-    fireEvent.click(enableButton);
-    expect(setSmartTransactionsPreferenceEnabled).toHaveBeenCalledWith(true);
-  });
-});
diff --git a/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.tsx b/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.tsx
deleted file mode 100644
index 2269018e2239..000000000000
--- a/ui/pages/smart-transactions/components/smart-transactions-opt-in-modal.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  TextColor,
-  Display,
-  FlexDirection,
-  BlockSize,
-  AlignItems,
-  TextAlign,
-  JustifyContent,
-  TextVariant,
-  IconColor,
-  FontWeight,
-} from '../../../helpers/constants/design-system';
-import {
-  Modal,
-  ModalOverlay,
-  Text,
-  Box,
-  Button,
-  ButtonVariant,
-  ModalHeader,
-  ModalContent,
-  ButtonLink,
-  ButtonLinkSize,
-  Icon,
-  IconName,
-} from '../../../components/component-library';
-import { setSmartTransactionsPreferenceEnabled } from '../../../store/actions';
-import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
-
-export type SmartTransactionsOptInModalProps = {
-  isOpen: boolean;
-  hideWhatsNewPopup: () => void;
-};
-
-const LearnMoreLink = () => {
-  const t = useI18nContext();
-  return (
-    <ButtonLink
-      size={ButtonLinkSize.Inherit}
-      textProps={{
-        variant: TextVariant.bodyMd,
-        alignItems: AlignItems.flexStart,
-      }}
-      as="a"
-      href={SMART_TRANSACTIONS_LEARN_MORE_URL}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      {t('learnMoreUpperCaseWithDot')}
-    </ButtonLink>
-  );
-};
-
-const EnableSmartTransactionsButton = ({
-  handleEnableButtonClick,
-}: {
-  handleEnableButtonClick: () => void;
-}) => {
-  const t = useI18nContext();
-  return (
-    <Button
-      marginTop={8}
-      variant={ButtonVariant.Primary}
-      onClick={handleEnableButtonClick}
-      width={BlockSize.Full}
-    >
-      {t('enable')}
-    </Button>
-  );
-};
-
-const NoThanksLink = ({
-  handleNoThanksLinkClick,
-}: {
-  handleNoThanksLinkClick: () => void;
-}) => {
-  const t = useI18nContext();
-  return (
-    <Button
-      marginTop={2}
-      type="link"
-      variant={ButtonVariant.Link}
-      color={TextColor.textAlternative}
-      onClick={handleNoThanksLinkClick}
-      width={BlockSize.Full}
-      className="mm-smart-transactions-opt-in-modal__no-thanks-link"
-    >
-      {t('noThanks')}
-    </Button>
-  );
-};
-
-const Description = () => {
-  const t = useI18nContext();
-  return (
-    <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
-      <Text variant={TextVariant.bodyMd} marginTop={4}>
-        {t('smartTransactionsDescription')}
-      </Text>
-      <Text variant={TextVariant.bodyMd} marginTop={4}>
-        {t('smartTransactionsDescription2', [<LearnMoreLink />])}
-      </Text>
-    </Box>
-  );
-};
-
-const Benefit = ({ text, iconName }: { text: string; iconName: IconName }) => {
-  return (
-    <Box
-      display={Display.Flex}
-      flexDirection={FlexDirection.Column}
-      className="mm-smart-transactions-opt-in-modal__benefit"
-      textAlign={TextAlign.Center}
-      alignItems={AlignItems.center}
-      justifyContent={JustifyContent.flexStart}
-    >
-      <Icon
-        name={iconName}
-        color={IconColor.primaryDefault}
-        className="mm-smart-transactions-opt-in-modal__icon"
-      />
-      <Text
-        variant={TextVariant.bodySm}
-        fontWeight={FontWeight.Medium}
-        marginTop={1}
-      >
-        {text}
-      </Text>
-    </Box>
-  );
-};
-
-const Benefits = () => {
-  const t = useI18nContext();
-  return (
-    <Box
-      display={Display.Flex}
-      flexDirection={FlexDirection.Row}
-      justifyContent={JustifyContent.center}
-      marginTop={4}
-      paddingLeft={5}
-      paddingRight={5}
-    >
-      <Benefit
-        text={t('smartTransactionsBenefit1')}
-        iconName={IconName.Confirmation}
-      />
-      <Benefit text={t('smartTransactionsBenefit2')} iconName={IconName.Coin} />
-      <Benefit
-        text={t('smartTransactionsBenefit3')}
-        iconName={IconName.Clock}
-      />
-    </Box>
-  );
-};
-
-export default function SmartTransactionsOptInModal({
-  isOpen,
-  hideWhatsNewPopup,
-}: SmartTransactionsOptInModalProps) {
-  const t = useI18nContext();
-  const dispatch = useDispatch();
-
-  const handleEnableButtonClick = useCallback(() => {
-    dispatch(setSmartTransactionsPreferenceEnabled(true));
-  }, [dispatch]);
-
-  const handleNoThanksLinkClick = useCallback(() => {
-    // Set the Smart Transactions opt-in status to false, so the opt-in modal is not shown again.
-    dispatch(setSmartTransactionsPreferenceEnabled(false));
-  }, [dispatch]);
-
-  useEffect(() => {
-    if (!isOpen) {
-      return;
-    }
-    // If the Smart Transactions Opt-In modal is open, hide the What's New popup,
-    // because we don't want to show 2 modals at the same time.
-    hideWhatsNewPopup();
-  }, [isOpen, hideWhatsNewPopup]);
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={handleEnableButtonClick}
-      isClosedOnOutsideClick={false}
-      isClosedOnEscapeKey={false}
-      className="mm-modal__custom-scrollbar mm-smart-transactions-opt-in-modal"
-      autoFocus={false}
-    >
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader
-          alignItems={AlignItems.center}
-          justifyContent={JustifyContent.center}
-        >
-          {t('smartTransactionsOptItModalTitle')}
-        </ModalHeader>
-        <Box
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
-          paddingLeft={4}
-          paddingRight={4}
-        >
-          <Benefits />
-          <Description />
-          <EnableSmartTransactionsButton
-            handleEnableButtonClick={handleEnableButtonClick}
-          />
-          <NoThanksLink handleNoThanksLinkClick={handleNoThanksLinkClick} />
-        </Box>
-      </ModalContent>
-    </Modal>
-  );
-}
diff --git a/ui/pages/smart-transactions/index.scss b/ui/pages/smart-transactions/index.scss
index 8ef1b35cd611..508db455a16c 100644
--- a/ui/pages/smart-transactions/index.scss
+++ b/ui/pages/smart-transactions/index.scss
@@ -1,2 +1 @@
 @import './smart-transaction-status-page/index';
-@import './components/index';

From 4e949841e0cfa68a3dcad2734c48699a8424dc82 Mon Sep 17 00:00:00 2001
From: Ulisses Ferreira <ulisses@hey.com>
Date: Wed, 6 Nov 2024 15:55:14 +0100
Subject: [PATCH 041/111] chore: add Solana shared utilities and constants
 (#28269)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

As we look to simplify snaps ability to support multiple chains we find
that some code needs to be included in the main extension to make sure
it can be easily imported throughout. In this PR we add utility
functions similar to the Bitcoin ones but for Solana.

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

## **Manual testing steps**

1. Run tests and make sure they still pass
2. Run build process and make sure it succeeds

## **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: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/images/solana-logo.svg              |  13 +
 development/build/scripts.js            |   1 +
 lavamoat/browserify/beta/policy.json    | 556 ++++++++++++++----------
 lavamoat/browserify/flask/policy.json   | 556 ++++++++++++++----------
 lavamoat/browserify/main/policy.json    | 556 ++++++++++++++----------
 lavamoat/browserify/mmi/policy.json     | 556 ++++++++++++++----------
 package.json                            |   3 +-
 shared/constants/multichain/assets.ts   |   5 +
 shared/constants/multichain/networks.ts |  70 ++-
 shared/lib/multichain.test.ts           |  23 +-
 shared/lib/multichain.ts                |  18 +
 yarn.lock                               | 109 ++++-
 12 files changed, 1487 insertions(+), 979 deletions(-)
 create mode 100644 app/images/solana-logo.svg

diff --git a/app/images/solana-logo.svg b/app/images/solana-logo.svg
new file mode 100644
index 000000000000..ed6f34d95f7e
--- /dev/null
+++ b/app/images/solana-logo.svg
@@ -0,0 +1,13 @@
+<svg width="101" height="88" viewBox="0 0 101 88" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M100.48 69.3817L83.8068 86.8015C83.4444 87.1799 83.0058 87.4816 82.5185 87.6878C82.0312 87.894 81.5055 88.0003 80.9743 88H1.93563C1.55849 88 1.18957 87.8926 0.874202 87.6912C0.558829 87.4897 0.31074 87.2029 0.160416 86.8659C0.0100923 86.529 -0.0359181 86.1566 0.0280382 85.7945C0.0919944 85.4324 0.263131 85.0964 0.520422 84.8278L17.2061 67.408C17.5676 67.0306 18.0047 66.7295 18.4904 66.5234C18.9762 66.3172 19.5002 66.2104 20.0301 66.2095H99.0644C99.4415 66.2095 99.8104 66.3169 100.126 66.5183C100.441 66.7198 100.689 67.0067 100.84 67.3436C100.99 67.6806 101.036 68.0529 100.972 68.415C100.908 68.7771 100.737 69.1131 100.48 69.3817ZM83.8068 34.3032C83.4444 33.9248 83.0058 33.6231 82.5185 33.4169C82.0312 33.2108 81.5055 33.1045 80.9743 33.1048H1.93563C1.55849 33.1048 1.18957 33.2121 0.874202 33.4136C0.558829 33.6151 0.31074 33.9019 0.160416 34.2388C0.0100923 34.5758 -0.0359181 34.9482 0.0280382 35.3103C0.0919944 35.6723 0.263131 36.0083 0.520422 36.277L17.2061 53.6968C17.5676 54.0742 18.0047 54.3752 18.4904 54.5814C18.9762 54.7875 19.5002 54.8944 20.0301 54.8952H99.0644C99.4415 54.8952 99.8104 54.7879 100.126 54.5864C100.441 54.3849 100.689 54.0981 100.84 53.7612C100.99 53.4242 101.036 53.0518 100.972 52.6897C100.908 52.3277 100.737 51.9917 100.48 51.723L83.8068 34.3032ZM1.93563 21.7905H80.9743C81.5055 21.7907 82.0312 21.6845 82.5185 21.4783C83.0058 21.2721 83.4444 20.9704 83.8068 20.592L100.48 3.17219C100.737 2.90357 100.908 2.56758 100.972 2.2055C101.036 1.84342 100.99 1.47103 100.84 1.13408C100.689 0.79713 100.441 0.510296 100.126 0.308823C99.8104 0.107349 99.4415 1.24074e-05 99.0644 0L20.0301 0C19.5002 0.000878397 18.9762 0.107699 18.4904 0.313848C18.0047 0.519998 17.5676 0.821087 17.2061 1.19848L0.524723 18.6183C0.267681 18.8866 0.0966198 19.2223 0.0325185 19.5839C-0.0315829 19.9456 0.0140624 20.3177 0.163856 20.6545C0.31365 20.9913 0.561081 21.2781 0.875804 21.4799C1.19053 21.6817 1.55886 21.7896 1.93563 21.7905Z" fill="url(#paint0_linear_174_4403)"/>
+<defs>
+<linearGradient id="paint0_linear_174_4403" x1="8.52558" y1="90.0973" x2="88.9933" y2="-3.01622" gradientUnits="userSpaceOnUse">
+<stop offset="0.08" stop-color="#9945FF"/>
+<stop offset="0.3" stop-color="#8752F3"/>
+<stop offset="0.5" stop-color="#5497D5"/>
+<stop offset="0.6" stop-color="#43B4CA"/>
+<stop offset="0.72" stop-color="#28E0B9"/>
+<stop offset="0.97" stop-color="#19FB9B"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 121e000a5673..3b571862df89 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -935,6 +935,7 @@ function setupBundlerDefaults(
             './**/node_modules/firebase',
             './**/node_modules/@firebase',
             './**/node_modules/marked',
+            './**/node_modules/@solana',
           ],
           global: true,
         },
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 108abcb4dd9a..eaac48a8f5f0 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -590,22 +590,52 @@
     },
     "@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
+    "@metamask/abi-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/accounts-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/accounts-controller>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
         "uuid": true
       }
     },
+    "@metamask/accounts-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/address-book-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -660,7 +690,6 @@
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
-        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
@@ -668,6 +697,7 @@
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
         "ethers>@ethersproject/address": true,
@@ -688,21 +718,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@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/base-controller": {
       "globals": {
         "setTimeout": true
@@ -751,30 +766,15 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@metamask/utils": 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/controller-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/controller-utils>@spruceid/siwe-parser": {
       "globals": {
         "console.error": true,
@@ -810,7 +810,7 @@
         "@ethersproject/providers": true,
         "@metamask/controller-utils": true,
         "@metamask/ens-controller>@metamask/base-controller": true,
-        "@metamask/utils": true,
+        "@metamask/ens-controller>@metamask/utils": true,
         "punycode": true
       }
     },
@@ -822,6 +822,21 @@
         "immer": 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
@@ -843,23 +858,38 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>@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-sig-util": true,
-        "@metamask/utils": true
+        "@metamask/eth-sig-util": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@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/eth-ledger-bridge-keyring": {
@@ -897,12 +927,27 @@
         "@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": true,
         "@metamask/utils>@scure/base": true,
         "browserify>buffer": true
       }
     },
+    "@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/eth-sig-util>tweetnacl": {
       "globals": {
         "crypto": true,
@@ -921,13 +966,28 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
     },
+    "@metamask/eth-snap-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/eth-snap-keyring>uuid": {
       "globals": {
         "crypto": true
@@ -1281,24 +1341,9 @@
     },
     "@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/json-rpc-engine>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/json-rpc-engine>@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/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/json-rpc-middleware-stream": {
@@ -1307,12 +1352,23 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },
-    "@metamask/json-rpc-middleware-stream>@metamask/utils": {
+    "@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-api>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1327,17 +1383,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -1351,9 +1396,9 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/keyring-controller>@metamask/utils": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
+        "@metamask/name-controller>async-mutex": true
       }
     },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
@@ -1364,21 +1409,66 @@
         "@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,
-        "@metamask/utils": 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-simple-keyring": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
         "browserify>buffer": true,
         "crypto-browserify>randombytes": true
       }
     },
+    "@metamask/keyring-controller>@metamask/eth-simple-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/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,
@@ -1442,13 +1532,28 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/message-manager>@metamask/utils": true,
         "@metamask/message-manager>jsonschema": true,
-        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
       }
     },
+    "@metamask/message-manager>@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/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1535,8 +1640,8 @@
         "@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,
-        "@metamask/utils": true,
         "browserify>assert": true,
         "browserify>util": true,
         "uri-js": true,
@@ -1675,27 +1780,57 @@
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider>@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/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-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/network-controller>reselect": {
@@ -1752,9 +1887,9 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/notification-services-controller>@metamask/utils": true,
         "@metamask/notification-services-controller>firebase": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
         "bignumber.js": true,
         "loglevel": true,
         "uuid": true
@@ -1765,6 +1900,21 @@
         "SuppressedError": true
       }
     },
+    "@metamask/notification-services-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/notification-services-controller>firebase": {
       "packages": {
         "@metamask/notification-services-controller>firebase>@firebase/app": true,
@@ -2055,10 +2205,25 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/post-message-stream>@metamask/utils": true,
         "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,
@@ -2186,24 +2351,9 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/queued-request-controller>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/selected-network-controller": true
-      }
-    },
-    "@metamask/queued-request-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/selected-network-controller": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rate-limit-controller": {
@@ -2262,23 +2412,8 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@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/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rpc-methods-flask>nanoid": {
@@ -2328,7 +2463,7 @@
         "@metamask/logging-controller": true,
         "@metamask/message-manager>jsonschema": true,
         "@metamask/signature-controller>@metamask/eth-sig-util": true,
-        "@metamask/signature-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
@@ -2360,21 +2495,6 @@
         "semver": true
       }
     },
-    "@metamask/signature-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/smart-transactions-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -2584,7 +2704,6 @@
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2595,6 +2714,7 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
+        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
@@ -2616,27 +2736,12 @@
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@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-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2688,34 +2793,18 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
-    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2730,7 +2819,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2740,28 +2829,13 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@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-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2769,12 +2843,12 @@
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2810,13 +2884,13 @@
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2834,7 +2908,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2847,41 +2921,11 @@
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -2948,7 +2992,7 @@
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/transaction-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-method-registry": true,
@@ -2974,21 +3018,6 @@
         "@swc/helpers>tslib": true
       }
     },
-    "@metamask/transaction-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/user-operation-controller": {
       "globals": {
         "fetch": true
@@ -3344,6 +3373,51 @@
         "process": true
       }
     },
+    "@solana/addresses": {
+      "globals": {
+        "Intl.Collator": true,
+        "TextEncoder": true,
+        "crypto.subtle.digest": true,
+        "crypto.subtle.exportKey": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/assertions": true,
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/codecs-strings": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/assertions": {
+      "globals": {
+        "crypto": true,
+        "isSecureContext": true
+      },
+      "packages": {
+        "@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
+      }
+    },
     "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
         "react-markdown>unist-util-visit": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 108abcb4dd9a..eaac48a8f5f0 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -590,22 +590,52 @@
     },
     "@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
+    "@metamask/abi-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/accounts-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/accounts-controller>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
         "uuid": true
       }
     },
+    "@metamask/accounts-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/address-book-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -660,7 +690,6 @@
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
-        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
@@ -668,6 +697,7 @@
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
         "ethers>@ethersproject/address": true,
@@ -688,21 +718,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@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/base-controller": {
       "globals": {
         "setTimeout": true
@@ -751,30 +766,15 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@metamask/utils": 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/controller-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/controller-utils>@spruceid/siwe-parser": {
       "globals": {
         "console.error": true,
@@ -810,7 +810,7 @@
         "@ethersproject/providers": true,
         "@metamask/controller-utils": true,
         "@metamask/ens-controller>@metamask/base-controller": true,
-        "@metamask/utils": true,
+        "@metamask/ens-controller>@metamask/utils": true,
         "punycode": true
       }
     },
@@ -822,6 +822,21 @@
         "immer": 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
@@ -843,23 +858,38 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>@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-sig-util": true,
-        "@metamask/utils": true
+        "@metamask/eth-sig-util": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@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/eth-ledger-bridge-keyring": {
@@ -897,12 +927,27 @@
         "@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": true,
         "@metamask/utils>@scure/base": true,
         "browserify>buffer": true
       }
     },
+    "@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/eth-sig-util>tweetnacl": {
       "globals": {
         "crypto": true,
@@ -921,13 +966,28 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
     },
+    "@metamask/eth-snap-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/eth-snap-keyring>uuid": {
       "globals": {
         "crypto": true
@@ -1281,24 +1341,9 @@
     },
     "@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/json-rpc-engine>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/json-rpc-engine>@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/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/json-rpc-middleware-stream": {
@@ -1307,12 +1352,23 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },
-    "@metamask/json-rpc-middleware-stream>@metamask/utils": {
+    "@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-api>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1327,17 +1383,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -1351,9 +1396,9 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/keyring-controller>@metamask/utils": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
+        "@metamask/name-controller>async-mutex": true
       }
     },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
@@ -1364,21 +1409,66 @@
         "@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,
-        "@metamask/utils": 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-simple-keyring": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
         "browserify>buffer": true,
         "crypto-browserify>randombytes": true
       }
     },
+    "@metamask/keyring-controller>@metamask/eth-simple-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/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,
@@ -1442,13 +1532,28 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/message-manager>@metamask/utils": true,
         "@metamask/message-manager>jsonschema": true,
-        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
       }
     },
+    "@metamask/message-manager>@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/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1535,8 +1640,8 @@
         "@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,
-        "@metamask/utils": true,
         "browserify>assert": true,
         "browserify>util": true,
         "uri-js": true,
@@ -1675,27 +1780,57 @@
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider>@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/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-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/network-controller>reselect": {
@@ -1752,9 +1887,9 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/notification-services-controller>@metamask/utils": true,
         "@metamask/notification-services-controller>firebase": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
         "bignumber.js": true,
         "loglevel": true,
         "uuid": true
@@ -1765,6 +1900,21 @@
         "SuppressedError": true
       }
     },
+    "@metamask/notification-services-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/notification-services-controller>firebase": {
       "packages": {
         "@metamask/notification-services-controller>firebase>@firebase/app": true,
@@ -2055,10 +2205,25 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/post-message-stream>@metamask/utils": true,
         "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,
@@ -2186,24 +2351,9 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/queued-request-controller>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/selected-network-controller": true
-      }
-    },
-    "@metamask/queued-request-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/selected-network-controller": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rate-limit-controller": {
@@ -2262,23 +2412,8 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@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/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rpc-methods-flask>nanoid": {
@@ -2328,7 +2463,7 @@
         "@metamask/logging-controller": true,
         "@metamask/message-manager>jsonschema": true,
         "@metamask/signature-controller>@metamask/eth-sig-util": true,
-        "@metamask/signature-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
@@ -2360,21 +2495,6 @@
         "semver": true
       }
     },
-    "@metamask/signature-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/smart-transactions-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -2584,7 +2704,6 @@
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2595,6 +2714,7 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
+        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
@@ -2616,27 +2736,12 @@
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@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-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2688,34 +2793,18 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
-    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2730,7 +2819,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2740,28 +2829,13 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@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-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2769,12 +2843,12 @@
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2810,13 +2884,13 @@
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2834,7 +2908,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2847,41 +2921,11 @@
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -2948,7 +2992,7 @@
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/transaction-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-method-registry": true,
@@ -2974,21 +3018,6 @@
         "@swc/helpers>tslib": true
       }
     },
-    "@metamask/transaction-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/user-operation-controller": {
       "globals": {
         "fetch": true
@@ -3344,6 +3373,51 @@
         "process": true
       }
     },
+    "@solana/addresses": {
+      "globals": {
+        "Intl.Collator": true,
+        "TextEncoder": true,
+        "crypto.subtle.digest": true,
+        "crypto.subtle.exportKey": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/assertions": true,
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/codecs-strings": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/assertions": {
+      "globals": {
+        "crypto": true,
+        "isSecureContext": true
+      },
+      "packages": {
+        "@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
+      }
+    },
     "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
         "react-markdown>unist-util-visit": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 108abcb4dd9a..eaac48a8f5f0 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -590,22 +590,52 @@
     },
     "@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
+    "@metamask/abi-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/accounts-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/accounts-controller>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
         "uuid": true
       }
     },
+    "@metamask/accounts-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/address-book-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -660,7 +690,6 @@
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
-        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
@@ -668,6 +697,7 @@
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
         "ethers>@ethersproject/address": true,
@@ -688,21 +718,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@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/base-controller": {
       "globals": {
         "setTimeout": true
@@ -751,30 +766,15 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@metamask/utils": 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/controller-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/controller-utils>@spruceid/siwe-parser": {
       "globals": {
         "console.error": true,
@@ -810,7 +810,7 @@
         "@ethersproject/providers": true,
         "@metamask/controller-utils": true,
         "@metamask/ens-controller>@metamask/base-controller": true,
-        "@metamask/utils": true,
+        "@metamask/ens-controller>@metamask/utils": true,
         "punycode": true
       }
     },
@@ -822,6 +822,21 @@
         "immer": 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
@@ -843,23 +858,38 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>@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-sig-util": true,
-        "@metamask/utils": true
+        "@metamask/eth-sig-util": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@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/eth-ledger-bridge-keyring": {
@@ -897,12 +927,27 @@
         "@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": true,
         "@metamask/utils>@scure/base": true,
         "browserify>buffer": true
       }
     },
+    "@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/eth-sig-util>tweetnacl": {
       "globals": {
         "crypto": true,
@@ -921,13 +966,28 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
     },
+    "@metamask/eth-snap-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/eth-snap-keyring>uuid": {
       "globals": {
         "crypto": true
@@ -1281,24 +1341,9 @@
     },
     "@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/json-rpc-engine>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/json-rpc-engine>@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/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/json-rpc-middleware-stream": {
@@ -1307,12 +1352,23 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },
-    "@metamask/json-rpc-middleware-stream>@metamask/utils": {
+    "@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-api>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1327,17 +1383,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -1351,9 +1396,9 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/keyring-controller>@metamask/utils": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
+        "@metamask/name-controller>async-mutex": true
       }
     },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
@@ -1364,21 +1409,66 @@
         "@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,
-        "@metamask/utils": 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-simple-keyring": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
         "browserify>buffer": true,
         "crypto-browserify>randombytes": true
       }
     },
+    "@metamask/keyring-controller>@metamask/eth-simple-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/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,
@@ -1442,13 +1532,28 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/message-manager>@metamask/utils": true,
         "@metamask/message-manager>jsonschema": true,
-        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
       }
     },
+    "@metamask/message-manager>@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/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1535,8 +1640,8 @@
         "@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,
-        "@metamask/utils": true,
         "browserify>assert": true,
         "browserify>util": true,
         "uri-js": true,
@@ -1675,27 +1780,57 @@
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider>@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/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-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/network-controller>reselect": {
@@ -1752,9 +1887,9 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/notification-services-controller>@metamask/utils": true,
         "@metamask/notification-services-controller>firebase": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
         "bignumber.js": true,
         "loglevel": true,
         "uuid": true
@@ -1765,6 +1900,21 @@
         "SuppressedError": true
       }
     },
+    "@metamask/notification-services-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/notification-services-controller>firebase": {
       "packages": {
         "@metamask/notification-services-controller>firebase>@firebase/app": true,
@@ -2055,10 +2205,25 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/post-message-stream>@metamask/utils": true,
         "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,
@@ -2186,24 +2351,9 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/queued-request-controller>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/selected-network-controller": true
-      }
-    },
-    "@metamask/queued-request-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/selected-network-controller": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rate-limit-controller": {
@@ -2262,23 +2412,8 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@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/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rpc-methods-flask>nanoid": {
@@ -2328,7 +2463,7 @@
         "@metamask/logging-controller": true,
         "@metamask/message-manager>jsonschema": true,
         "@metamask/signature-controller>@metamask/eth-sig-util": true,
-        "@metamask/signature-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
@@ -2360,21 +2495,6 @@
         "semver": true
       }
     },
-    "@metamask/signature-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/smart-transactions-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -2584,7 +2704,6 @@
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2595,6 +2714,7 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
+        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
@@ -2616,27 +2736,12 @@
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@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-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2688,34 +2793,18 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
-    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2730,7 +2819,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2740,28 +2829,13 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@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-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2769,12 +2843,12 @@
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2810,13 +2884,13 @@
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2834,7 +2908,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2847,41 +2921,11 @@
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -2948,7 +2992,7 @@
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/transaction-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-method-registry": true,
@@ -2974,21 +3018,6 @@
         "@swc/helpers>tslib": true
       }
     },
-    "@metamask/transaction-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/user-operation-controller": {
       "globals": {
         "fetch": true
@@ -3344,6 +3373,51 @@
         "process": true
       }
     },
+    "@solana/addresses": {
+      "globals": {
+        "Intl.Collator": true,
+        "TextEncoder": true,
+        "crypto.subtle.digest": true,
+        "crypto.subtle.exportKey": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/assertions": true,
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/codecs-strings": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/assertions": {
+      "globals": {
+        "crypto": true,
+        "isSecureContext": true
+      },
+      "packages": {
+        "@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
+      }
+    },
     "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
         "react-markdown>unist-util-visit": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index ec387ee6733f..467ef781215c 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -682,22 +682,52 @@
     },
     "@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
+    "@metamask/abi-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/accounts-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/accounts-controller>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
         "uuid": true
       }
     },
+    "@metamask/accounts-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/address-book-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -752,7 +782,6 @@
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/polling-controller": true,
-        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
@@ -760,6 +789,7 @@
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
         "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
         "ethers>@ethersproject/address": true,
@@ -780,21 +810,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@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/base-controller": {
       "globals": {
         "setTimeout": true
@@ -843,30 +858,15 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@metamask/utils": 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/controller-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/controller-utils>@spruceid/siwe-parser": {
       "globals": {
         "console.error": true,
@@ -902,7 +902,7 @@
         "@ethersproject/providers": true,
         "@metamask/controller-utils": true,
         "@metamask/ens-controller>@metamask/base-controller": true,
-        "@metamask/utils": true,
+        "@metamask/ens-controller>@metamask/utils": true,
         "punycode": true
       }
     },
@@ -914,6 +914,21 @@
         "immer": 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
@@ -935,23 +950,38 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>@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-sig-util": true,
-        "@metamask/utils": true
+        "@metamask/eth-sig-util": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/eth-json-rpc-middleware>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@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/eth-ledger-bridge-keyring": {
@@ -989,12 +1019,27 @@
         "@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": true,
         "@metamask/utils>@scure/base": true,
         "browserify>buffer": true
       }
     },
+    "@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/eth-sig-util>tweetnacl": {
       "globals": {
         "crypto": true,
@@ -1013,13 +1058,28 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
     },
+    "@metamask/eth-snap-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/eth-snap-keyring>uuid": {
       "globals": {
         "crypto": true
@@ -1373,24 +1433,9 @@
     },
     "@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/json-rpc-engine>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/json-rpc-engine>@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/safe-event-emitter": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/json-rpc-middleware-stream": {
@@ -1399,12 +1444,23 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/json-rpc-middleware-stream>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },
-    "@metamask/json-rpc-middleware-stream>@metamask/utils": {
+    "@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-api>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1419,17 +1475,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
     "@metamask/keyring-api>uuid": {
       "globals": {
         "crypto": true
@@ -1443,9 +1488,9 @@
         "@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/keyring-controller>@metamask/utils": true,
         "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
+        "@metamask/name-controller>async-mutex": true
       }
     },
     "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
@@ -1456,21 +1501,66 @@
         "@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,
-        "@metamask/utils": 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-simple-keyring": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
         "browserify>buffer": true,
         "crypto-browserify>randombytes": true
       }
     },
+    "@metamask/keyring-controller>@metamask/eth-simple-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/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,
@@ -1534,13 +1624,28 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-sig-util": true,
+        "@metamask/message-manager>@metamask/utils": true,
         "@metamask/message-manager>jsonschema": true,
-        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
       }
     },
+    "@metamask/message-manager>@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/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1627,8 +1732,8 @@
         "@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,
-        "@metamask/utils": true,
         "browserify>assert": true,
         "browserify>util": true,
         "uri-js": true,
@@ -1767,27 +1872,57 @@
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/eth-json-rpc-provider>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider>@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/safe-event-emitter": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/safe-event-emitter": true
       }
     },
     "@metamask/network-controller>@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
+        "@metamask/network-controller>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/network-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/network-controller>reselect": {
@@ -1844,9 +1979,9 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/notification-services-controller>@metamask/utils": true,
         "@metamask/notification-services-controller>firebase": true,
         "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
         "bignumber.js": true,
         "loglevel": true,
         "uuid": true
@@ -1857,6 +1992,21 @@
         "SuppressedError": true
       }
     },
+    "@metamask/notification-services-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/notification-services-controller>firebase": {
       "packages": {
         "@metamask/notification-services-controller>firebase>@firebase/app": true,
@@ -2147,10 +2297,25 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/post-message-stream>@metamask/utils": true,
         "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,
@@ -2278,24 +2443,9 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/queued-request-controller>@metamask/utils": true,
         "@metamask/rpc-errors": true,
-        "@metamask/selected-network-controller": true
-      }
-    },
-    "@metamask/queued-request-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/selected-network-controller": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rate-limit-controller": {
@@ -2354,23 +2504,8 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@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/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/rpc-methods-flask>nanoid": {
@@ -2420,7 +2555,7 @@
         "@metamask/logging-controller": true,
         "@metamask/message-manager>jsonschema": true,
         "@metamask/signature-controller>@metamask/eth-sig-util": true,
-        "@metamask/signature-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "uuid": true,
         "webpack>events": true
@@ -2452,21 +2587,6 @@
         "semver": true
       }
     },
-    "@metamask/signature-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/smart-transactions-controller": {
       "globals": {
         "URLSearchParams": true,
@@ -2676,7 +2796,6 @@
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2687,6 +2806,7 @@
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
+        "@metamask/utils": true,
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
@@ -2708,27 +2828,12 @@
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@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-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2780,34 +2885,18 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
-        "@metamask/snaps-execution-environments>@metamask/utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
-    "@metamask/snaps-execution-environments>@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-rpc-methods": {
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": 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
       }
@@ -2822,7 +2911,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2832,28 +2921,13 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-rpc-methods>@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-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -2861,12 +2935,12 @@
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2902,13 +2976,13 @@
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>@metamask/utils": 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,
@@ -2926,7 +3000,7 @@
         "@metamask/json-rpc-engine": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
+        "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
       }
@@ -2939,41 +3013,11 @@
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry>@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>@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>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -3040,7 +3084,7 @@
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/transaction-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-method-registry": true,
@@ -3066,21 +3110,6 @@
         "@swc/helpers>tslib": true
       }
     },
-    "@metamask/transaction-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/user-operation-controller": {
       "globals": {
         "fetch": true
@@ -3436,6 +3465,51 @@
         "process": true
       }
     },
+    "@solana/addresses": {
+      "globals": {
+        "Intl.Collator": true,
+        "TextEncoder": true,
+        "crypto.subtle.digest": true,
+        "crypto.subtle.exportKey": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/assertions": true,
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/codecs-strings": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/assertions": {
+      "globals": {
+        "crypto": true,
+        "isSecureContext": true
+      },
+      "packages": {
+        "@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
+      }
+    },
     "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
         "react-markdown>unist-util-visit": true
diff --git a/package.json b/package.json
index 921472a1c27e..36ee8a48923f 100644
--- a/package.json
+++ b/package.json
@@ -348,7 +348,7 @@
     "@metamask/snaps-utils": "^8.5.1",
     "@metamask/transaction-controller": "^38.1.0",
     "@metamask/user-operation-controller": "^13.0.0",
-    "@metamask/utils": "^9.3.0",
+    "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.3.3",
     "@popperjs/core": "^2.4.0",
@@ -357,6 +357,7 @@
     "@sentry/browser": "^8.33.1",
     "@sentry/types": "^8.33.1",
     "@sentry/utils": "^8.33.1",
+    "@solana/addresses": "2.0.0-rc.4",
     "@swc/core": "1.4.11",
     "@trezor/connect-web": "^9.4.0",
     "@zxing/browser": "^0.1.4",
diff --git a/shared/constants/multichain/assets.ts b/shared/constants/multichain/assets.ts
index 988a9fbad624..23462d57d05a 100644
--- a/shared/constants/multichain/assets.ts
+++ b/shared/constants/multichain/assets.ts
@@ -2,9 +2,14 @@ import { MultichainNetworks } from './networks';
 
 export const MULTICHAIN_NATIVE_CURRENCY_TO_CAIP19 = {
   BTC: `${MultichainNetworks.BITCOIN}/slip44:0`,
+  SOL: `${MultichainNetworks.SOLANA}/slip44:501`,
 } as const;
 
 export enum MultichainNativeAssets {
   BITCOIN = `${MultichainNetworks.BITCOIN}/slip44:0`,
   BITCOIN_TESTNET = `${MultichainNetworks.BITCOIN_TESTNET}/slip44:0`,
+
+  SOLANA = `${MultichainNetworks.SOLANA}/slip44:501`,
+  SOLANA_DEVNET = `${MultichainNetworks.SOLANA_DEVNET}/slip44:501`,
+  SOLANA_TESTNET = `${MultichainNetworks.SOLANA_TESTNET}/slip44:501`,
 }
diff --git a/shared/constants/multichain/networks.ts b/shared/constants/multichain/networks.ts
index 5217394a5415..04ee1134c0b6 100644
--- a/shared/constants/multichain/networks.ts
+++ b/shared/constants/multichain/networks.ts
@@ -1,5 +1,9 @@
 import { CaipChainId } from '@metamask/utils';
-import { isBtcMainnetAddress, isBtcTestnetAddress } from '../../lib/multichain';
+import {
+  isBtcMainnetAddress,
+  isBtcTestnetAddress,
+  isSolanaAddress,
+} from '../../lib/multichain';
 
 export type ProviderConfigWithImageUrl = {
   rpcUrl?: string;
@@ -21,24 +25,39 @@ export type MultichainProviderConfig = ProviderConfigWithImageUrl & {
 export enum MultichainNetworks {
   BITCOIN = 'bip122:000000000019d6689c085ae165831e93',
   BITCOIN_TESTNET = 'bip122:000000000933ea01ad0ee984209779ba',
+
+  SOLANA = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  SOLANA_DEVNET = 'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
+  SOLANA_TESTNET = 'solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
 }
 
 export const BITCOIN_TOKEN_IMAGE_URL = './images/bitcoin-logo.svg';
+export const SOLANA_TOKEN_IMAGE_URL = './images/solana-logo.svg';
 
 export const MULTICHAIN_NETWORK_BLOCK_EXPLORER_URL_MAP = {
   [MultichainNetworks.BITCOIN]: 'https://blockstream.info/address',
   [MultichainNetworks.BITCOIN_TESTNET]:
     'https://blockstream.info/testnet/address',
+
+  [MultichainNetworks.SOLANA]: 'https://explorer.solana.com/',
+  [MultichainNetworks.SOLANA_DEVNET]:
+    'https://explorer.solana.com/?cluster=devnet',
+  [MultichainNetworks.SOLANA_TESTNET]:
+    'https://explorer.solana.com/?cluster=testnet',
 } as const;
 
 export const MULTICHAIN_TOKEN_IMAGE_MAP = {
   [MultichainNetworks.BITCOIN]: BITCOIN_TOKEN_IMAGE_URL,
+  [MultichainNetworks.SOLANA]: SOLANA_TOKEN_IMAGE_URL,
 } as const;
 
 export const MULTICHAIN_PROVIDER_CONFIGS: Record<
   CaipChainId,
   MultichainProviderConfig
 > = {
+  /**
+   * Bitcoin
+   */
   [MultichainNetworks.BITCOIN]: {
     chainId: MultichainNetworks.BITCOIN,
     rpcUrl: '', // not used
@@ -69,4 +88,53 @@ export const MULTICHAIN_PROVIDER_CONFIGS: Record<
     },
     isAddressCompatible: isBtcTestnetAddress,
   },
+  /**
+   * Solana
+   */
+  [MultichainNetworks.SOLANA]: {
+    chainId: MultichainNetworks.SOLANA,
+    rpcUrl: '', // not used
+    ticker: 'SOL',
+    nickname: 'Solana',
+    id: 'solana-mainnet',
+    type: 'rpc',
+    rpcPrefs: {
+      imageUrl: MULTICHAIN_TOKEN_IMAGE_MAP[MultichainNetworks.SOLANA],
+      blockExplorerUrl:
+        MULTICHAIN_NETWORK_BLOCK_EXPLORER_URL_MAP[MultichainNetworks.SOLANA],
+    },
+    isAddressCompatible: isSolanaAddress,
+  },
+  [MultichainNetworks.SOLANA_DEVNET]: {
+    chainId: MultichainNetworks.SOLANA_DEVNET,
+    rpcUrl: '', // not used
+    ticker: 'SOL',
+    nickname: 'Solana (devnet)',
+    id: 'solana-devnet',
+    type: 'rpc',
+    rpcPrefs: {
+      imageUrl: MULTICHAIN_TOKEN_IMAGE_MAP[MultichainNetworks.SOLANA],
+      blockExplorerUrl:
+        MULTICHAIN_NETWORK_BLOCK_EXPLORER_URL_MAP[
+          MultichainNetworks.SOLANA_DEVNET
+        ],
+    },
+    isAddressCompatible: isSolanaAddress,
+  },
+  [MultichainNetworks.SOLANA_TESTNET]: {
+    chainId: MultichainNetworks.SOLANA_TESTNET,
+    rpcUrl: '', // not used
+    ticker: 'SOL',
+    nickname: 'Solana (testnet)',
+    id: 'solana-testnet',
+    type: 'rpc',
+    rpcPrefs: {
+      imageUrl: MULTICHAIN_TOKEN_IMAGE_MAP[MultichainNetworks.SOLANA],
+      blockExplorerUrl:
+        MULTICHAIN_NETWORK_BLOCK_EXPLORER_URL_MAP[
+          MultichainNetworks.SOLANA_TESTNET
+        ],
+    },
+    isAddressCompatible: isSolanaAddress,
+  },
 };
diff --git a/shared/lib/multichain.test.ts b/shared/lib/multichain.test.ts
index 4c1bab12d03b..6e8abd726fb8 100644
--- a/shared/lib/multichain.test.ts
+++ b/shared/lib/multichain.test.ts
@@ -3,6 +3,7 @@ import {
   getCaipNamespaceFromAddress,
   isBtcMainnetAddress,
   isBtcTestnetAddress,
+  isSolanaAddress,
 } from './multichain';
 
 const BTC_MAINNET_ADDRESSES = [
@@ -61,10 +62,24 @@ describe('multichain', () => {
     );
   });
 
+  describe('isSolanaAddress', () => {
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(SOL_ADDRESSES)(
+      'returns true if address is a valid Solana address: %s',
+      (address: string) => {
+        expect(isSolanaAddress(address)).toBe(true);
+      },
+    );
+
+    it('should return false for invalid Solana addresses', () => {
+      expect(isSolanaAddress('invalid')).toBe(false);
+    });
+  });
+
   describe('getChainTypeFromAddress', () => {
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each([...BTC_MAINNET_ADDRESSES, ...BTC_TESTNET_ADDRESSES])(
-      'returns ChainType.Bitcoin for bitcoin address: %s',
+      'returns KnownCaipNamespace.Bitcoin for bitcoin address: %s',
       (address: string) => {
         expect(getCaipNamespaceFromAddress(address)).toBe(
           KnownCaipNamespace.Bip122,
@@ -74,7 +89,7 @@ describe('multichain', () => {
 
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each(ETH_ADDRESSES)(
-      'returns ChainType.Ethereum for ethereum address: %s',
+      'returns KnownCaipNamespace.Ethereum for ethereum address: %s',
       (address: string) => {
         expect(getCaipNamespaceFromAddress(address)).toBe(
           KnownCaipNamespace.Eip155,
@@ -84,10 +99,10 @@ describe('multichain', () => {
 
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each(SOL_ADDRESSES)(
-      'returns ChainType.Ethereum for non-supported address: %s',
+      'returns KnownCaipNamespace.Solana for non-supported address: %s',
       (address: string) => {
         expect(getCaipNamespaceFromAddress(address)).toBe(
-          KnownCaipNamespace.Eip155,
+          KnownCaipNamespace.Solana,
         );
       },
     );
diff --git a/shared/lib/multichain.ts b/shared/lib/multichain.ts
index 942a9ce6c964..815d9d9e6763 100644
--- a/shared/lib/multichain.ts
+++ b/shared/lib/multichain.ts
@@ -1,5 +1,6 @@
 import { CaipNamespace, KnownCaipNamespace } from '@metamask/utils';
 import { validate, Network } from 'bitcoin-address-validation';
+import { isAddress } from '@solana/addresses';
 
 /**
  * Returns whether an address is on the Bitcoin mainnet.
@@ -28,6 +29,18 @@ export function isBtcTestnetAddress(address: string): boolean {
   return validate(address, Network.testnet);
 }
 
+/**
+ * Returns whether an address is a valid Solana address, specifically an account's.
+ * Derived addresses (like Program's) will return false.
+ * See: https://stackoverflow.com/questions/71200948/how-can-i-validate-a-solana-wallet-address-with-web3js
+ *
+ * @param address - The address to check.
+ * @returns `true` if the address is a valid Solana address, `false` otherwise.
+ */
+export function isSolanaAddress(address: string): boolean {
+  return isAddress(address);
+}
+
 /**
  * Returns the associated chain's type for the given address.
  *
@@ -38,6 +51,11 @@ export function getCaipNamespaceFromAddress(address: string): CaipNamespace {
   if (isBtcMainnetAddress(address) || isBtcTestnetAddress(address)) {
     return KnownCaipNamespace.Bip122;
   }
+
+  if (isSolanaAddress(address)) {
+    return KnownCaipNamespace.Solana;
+  }
+
   // Defaults to "Ethereum" for all other cases for now.
   return KnownCaipNamespace.Eip155;
 }
diff --git a/yarn.lock b/yarn.lock
index 4c3305e98b13..ef12aefdc6a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6493,9 +6493,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@metamask/utils@npm:10.0.0"
+"@metamask/utils@npm:^10.0.0, @metamask/utils@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/utils@npm:10.0.1"
   dependencies:
     "@ethereumjs/tx": "npm:^4.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
@@ -6506,7 +6506,7 @@ __metadata:
     pony-cause: "npm:^2.1.10"
     semver: "npm:^7.5.4"
     uuid: "npm:^9.0.1"
-  checksum: 10/9c2e6421f685d8a45145b6026a6f9fd0701eb5a2e8490fc6d18e64c103d5a62097f301cbc797790da52ceb5853bd9f65845c934b00299e69e5e6736c52b32f0f
+  checksum: 10/c8e3d7578d05a1da4abb6c6712ec78ef6990801269f6529f4bb237b7d6e228d10a40738ccab81ad554f2fd51670267d086dc5be1a31c6d1f7040d4c0469d9d13
   languageName: node
   linkType: hard
 
@@ -6527,7 +6527,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.3.0":
+"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1":
   version: 9.3.0
   resolution: "@metamask/utils@npm:9.3.0"
   dependencies:
@@ -8033,6 +8033,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@solana/addresses@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/addresses@npm:2.0.0-rc.4"
+  dependencies:
+    "@solana/assertions": "npm:2.0.0-rc.4"
+    "@solana/codecs-core": "npm:2.0.0-rc.4"
+    "@solana/codecs-strings": "npm:2.0.0-rc.4"
+    "@solana/errors": "npm:2.0.0-rc.4"
+  peerDependencies:
+    typescript: ">=5"
+  checksum: 10/c7ca5cb7e36c722adb6fdc830f58c6abe85562297b5a34f7a057bd976328b83d3dff56c520aff35f718363f976685265c1cb25fcafd20d21439b0dbefd442e7f
+  languageName: node
+  linkType: hard
+
+"@solana/assertions@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/assertions@npm:2.0.0-rc.4"
+  dependencies:
+    "@solana/errors": "npm:2.0.0-rc.4"
+  peerDependencies:
+    typescript: ">=5"
+  checksum: 10/73ef846a7caba5922c0d281e9296b8e62c298642abdb88f20241861cdcf4b75201002606af11469d5ecc24057c18c0184a3cc585a74a455cf99e93aeefcd869a
+  languageName: node
+  linkType: hard
+
 "@solana/buffer-layout@npm:^4.0.1":
   version: 4.0.1
   resolution: "@solana/buffer-layout@npm:4.0.1"
@@ -8042,9 +8067,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@solana/codecs-core@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/codecs-core@npm:2.0.0-rc.4"
+  dependencies:
+    "@solana/errors": "npm:2.0.0-rc.4"
+  peerDependencies:
+    typescript: ">=5"
+  checksum: 10/105f78bce23bf94a12fb11bcd244f55a4f31b09620791c90f23fe36979239c94c7ce585056b086989c87884941d5803b5bd10657691815033724836b65441b81
+  languageName: node
+  linkType: hard
+
+"@solana/codecs-numbers@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/codecs-numbers@npm:2.0.0-rc.4"
+  dependencies:
+    "@solana/codecs-core": "npm:2.0.0-rc.4"
+    "@solana/errors": "npm:2.0.0-rc.4"
+  peerDependencies:
+    typescript: ">=5"
+  checksum: 10/dd024424a2833f303472eb22c31584106a1e07ab893b7b29fb3cf26907f9786be2b753a5106a9a9bce8a077fbdd9f41598fa4ca40998d07598e90d6a80ec2af7
+  languageName: node
+  linkType: hard
+
+"@solana/codecs-strings@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/codecs-strings@npm:2.0.0-rc.4"
+  dependencies:
+    "@solana/codecs-core": "npm:2.0.0-rc.4"
+    "@solana/codecs-numbers": "npm:2.0.0-rc.4"
+    "@solana/errors": "npm:2.0.0-rc.4"
+  peerDependencies:
+    fastestsmallesttextencoderdecoder: ^1.0.22
+    typescript: ">=5"
+  checksum: 10/e008743bb69c868309540463126756a55ff0e5ff89f383c7c3476c733d9a320d8b929e2d41f48965bad952988c6ae8ebe8f613242e37418e0f5c2974b9fb254d
+  languageName: node
+  linkType: hard
+
+"@solana/errors@npm:2.0.0-rc.4":
+  version: 2.0.0-rc.4
+  resolution: "@solana/errors@npm:2.0.0-rc.4"
+  dependencies:
+    chalk: "npm:^5.3.0"
+    commander: "npm:^12.1.0"
+  peerDependencies:
+    typescript: ">=5"
+  bin:
+    errors: bin/cli.mjs
+  checksum: 10/a4fa69658baeb971b9659ba8afffd4f19269ec68fb5f68d12e958071d5484df913a681a96ba0e9b646efb4d0b2a354bc55c1f94ff47b061d280708681e8276c5
+  languageName: node
+  linkType: hard
+
 "@solana/web3.js@npm:^1.95.0":
-  version: 1.95.3
-  resolution: "@solana/web3.js@npm:1.95.3"
+  version: 1.95.4
+  resolution: "@solana/web3.js@npm:1.95.4"
   dependencies:
     "@babel/runtime": "npm:^7.25.0"
     "@noble/curves": "npm:^1.4.2"
@@ -8061,7 +8137,7 @@ __metadata:
     node-fetch: "npm:^2.7.0"
     rpc-websockets: "npm:^9.0.2"
     superstruct: "npm:^2.0.2"
-  checksum: 10/25bdc5100faae6d3e48cbfac965b129060bec61669dcd75d0a525cea3ce8d23632ebea249a7b21616c89641bf7ea26d18826ce51246274b6aa1278d32180c870
+  checksum: 10/353e04ac1110035ff108f16af4029c7a98f71cce841d45877c9bc4a354cdc58a051681603c92289b81e3dc5ef6b1567c6f866e4ba56a434db145e38a5a41d276
   languageName: node
   linkType: hard
 
@@ -14646,6 +14722,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea
+  languageName: node
+  linkType: hard
+
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -15260,6 +15343,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "commander@npm:12.1.0"
+  checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93
+  languageName: node
+  linkType: hard
+
 "commander@npm:^2.15.0, commander@npm:^2.18.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.6.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -26473,7 +26563,7 @@ __metadata:
     "@metamask/test-dapp": "npm:8.13.0"
     "@metamask/transaction-controller": "npm:^38.1.0"
     "@metamask/user-operation-controller": "npm:^13.0.0"
-    "@metamask/utils": "npm:^9.3.0"
+    "@metamask/utils": "npm:^10.0.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"
     "@noble/hashes": "npm:^1.3.3"
     "@octokit/core": "npm:^3.6.0"
@@ -26490,6 +26580,7 @@ __metadata:
     "@sentry/cli": "npm:^2.19.4"
     "@sentry/types": "npm:^8.33.1"
     "@sentry/utils": "npm:^8.33.1"
+    "@solana/addresses": "npm:2.0.0-rc.4"
     "@storybook/addon-a11y": "npm:^7.6.20"
     "@storybook/addon-actions": "npm:^7.6.20"
     "@storybook/addon-designs": "npm:^7.0.9"

From ef03946841564b297cb1dccb950eb8c889426e79 Mon Sep 17 00:00:00 2001
From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com>
Date: Wed, 6 Nov 2024 19:50:49 +0400
Subject: [PATCH 042/111] feat: team-label-token (#28134)
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/28134?quickstart=1)

This PR updates the add-team-label job with the newly introduced
TEAM_LABEL_TOKEN.

## **Related issues**

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

## **Manual testing steps**

1. CI green with new token

## **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/add-team-label.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/add-team-label.yml b/.github/workflows/add-team-label.yml
index 2046456ef426..b5d9eaa18603 100644
--- a/.github/workflows/add-team-label.yml
+++ b/.github/workflows/add-team-label.yml
@@ -7,8 +7,6 @@ on:
 
 jobs:
   add-team-label:
-    uses: metamask/github-tools/.github/workflows/add-team-label.yml@058012b49ff2fbd9649c566ba43b29497f93b21d
-    permissions:
-      pull-requests: write
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@18af6e4b56a18230d1792480e249ebc50b324927
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
+      TEAM_LABEL_TOKEN: ${{ secrets.TEAM_LABEL_TOKEN }}

From 201752e931239d4040194c48938423041944446e Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:06:42 -0500
Subject: [PATCH 043/111] build(webpack): fix cache issues in webpack build by
 updating `html-bundler-webpack-plugin` to v4.4.1 (#28225)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #27831

<!--
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**


## **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.
-->
---
 package.json |   4 +-
 yarn.lock    | 106 +++++++++++++++++++++++----------------------------
 2 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 36ee8a48923f..14b38d504c87 100644
--- a/package.json
+++ b/package.json
@@ -596,7 +596,7 @@
     "gulp-stylelint": "^13.0.0",
     "gulp-watch": "^5.0.1",
     "gulp-zip": "^5.1.0",
-    "html-bundler-webpack-plugin": "^3.17.3",
+    "html-bundler-webpack-plugin": "^4.4.1",
     "https-browserify": "^1.0.0",
     "husky": "^8.0.3",
     "ini": "^3.0.0",
@@ -670,7 +670,7 @@
     "wait-on": "^7.0.1",
     "watchify": "^4.0.0",
     "webextension-polyfill": "^0.8.0",
-    "webpack": "^5.91.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.3",
     "ws": "^8.17.1",
diff --git a/yarn.lock b/yarn.lock
index ef12aefdc6a4..9a54de8897d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10341,13 +10341,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.4
-  resolution: "@types/eslint-scope@npm:3.7.4"
+"@types/eslint-scope@npm:^3.7.7":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
   dependencies:
     "@types/eslint": "npm:*"
     "@types/estree": "npm:*"
-  checksum: 10/ea6a9363e92f301cd3888194469f9ec9d0021fe0a397a97a6dd689e7545c75de0bd2153dfb13d3ab532853a278b6572c6f678ce846980669e41029d205653460
+  checksum: 10/e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
   languageName: node
   linkType: hard
 
@@ -10361,10 +10361,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@types/estree@npm:1.0.5"
-  checksum: 10/7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408
+"@types/estree@npm:*, @types/estree@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@types/estree@npm:1.0.6"
+  checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d
   languageName: node
   linkType: hard
 
@@ -12093,15 +12093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "acorn-import-assertions@npm:1.9.0"
-  peerDependencies:
-    acorn: ^8
-  checksum: 10/af8dd58f6b0c6a43e85849744534b99f2133835c6fcdabda9eea27d0a0da625a0d323c4793ba7cb25cf4507609d0f747c210ccc2fc9b5866de04b0e59c9c5617
-  languageName: node
-  linkType: hard
-
 "acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
@@ -12154,12 +12145,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
+"acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.14.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.14.0
+  resolution: "acorn@npm:8.14.0"
   bin:
     acorn: bin/acorn
-  checksum: 10/b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd
+  checksum: 10/6df29c35556782ca9e632db461a7f97947772c6c1d5438a81f0c873a3da3a792487e83e404d1c6c25f70513e91aa18745f6eafb1fcc3a43ecd1920b21dd173d2
   languageName: node
   linkType: hard
 
@@ -12564,10 +12555,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansis@npm:2.0.3":
-  version: 2.0.3
-  resolution: "ansis@npm:2.0.3"
-  checksum: 10/7ac1a7505536ec20523fc57e2234c38f7bc0620eff90bfb3efe237384ccc392dae4445c77ec6ffe5159002a65cc5b77227610b9228bb2b68e065490520ef9476
+"ansis@npm:3.3.2":
+  version: 3.3.2
+  resolution: "ansis@npm:3.3.2"
+  checksum: 10/e6c7b93a4f7b1e22c2d11ba53736af7f56c2952f6497ea109757573738fa0e7317066377577d9896a3e1db7ce2bd622ab2eabc7f6cdab6c0e0f9b25eebb5d2af
   languageName: node
   linkType: hard
 
@@ -14156,7 +14147,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.12.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0":
+"browserslist@npm:^4.12.0, browserslist@npm:^4.23.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0":
   version: 4.24.2
   resolution: "browserslist@npm:4.24.2"
   dependencies:
@@ -17583,13 +17574,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:>=5.7.0, enhanced-resolve@npm:^5.14.1, enhanced-resolve@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "enhanced-resolve@npm:5.16.0"
+"enhanced-resolve@npm:>=5.7.0, enhanced-resolve@npm:^5.14.1, enhanced-resolve@npm:^5.17.1":
+  version: 5.17.1
+  resolution: "enhanced-resolve@npm:5.17.1"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 10/47f123676b9b179b35195769b9d9523f314f6fc3a13d4461a4d95d5beaec9adc26aaa3b60b61f93e21ed1290dff0e9d9e67df343ec47f4480669a8e26ffe52a3
+  checksum: 10/e8e03cb7a4bf3c0250a89afbd29e5ec20e90ba5fcd026066232a0754864d7d0a393fa6fc0e5379314a6529165a1834b36731147080714459d98924520410d8f5
   languageName: node
   linkType: hard
 
@@ -18662,10 +18653,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eta@npm:^3.2.0, eta@npm:^3.4.0":
-  version: 3.4.1
-  resolution: "eta@npm:3.4.1"
-  checksum: 10/be903dbe7b01b0c7bde1f6ee311a6b6e5a4bc5aa0400c970912d517cafb1a5cc2aab58e19751d8333cadb80a2256bf02e6e0c08a2aef0153800774f61cc4db49
+"eta@npm:^3.2.0, eta@npm:^3.5.0":
+  version: 3.5.0
+  resolution: "eta@npm:3.5.0"
+  checksum: 10/d3d90609cfd8cb837c9690a203f13a166118ccfe13e9ccb924d4a8251832e4d5fc39fedf9569a186c2e70abe1e15b15326434ea2a17311b1072f52e61229d461
   languageName: node
   linkType: hard
 
@@ -21658,28 +21649,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-bundler-webpack-plugin@npm:^3.17.3":
-  version: 3.17.3
-  resolution: "html-bundler-webpack-plugin@npm:3.17.3"
+"html-bundler-webpack-plugin@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "html-bundler-webpack-plugin@npm:4.4.1"
   dependencies:
     "@types/html-minifier-terser": "npm:^7.0.2"
-    ansis: "npm:2.0.3"
+    ansis: "npm:3.3.2"
     enhanced-resolve: "npm:>=5.7.0"
-    eta: "npm:^3.4.0"
+    eta: "npm:^3.5.0"
     html-minifier-terser: "npm:^7.2.0"
   peerDependencies:
-    ejs: ">=3.1.9"
-    favicons: ">=7.1.4"
-    handlebars: ">=4.7.7"
-    liquidjs: ">=10.7.0"
+    ejs: ">=3.1.10"
+    favicons: ">=7.2.0"
+    handlebars: ">=4.7.8"
+    liquidjs: ">=10.17.0"
     markdown-it: ">=12"
     mustache: ">=4.2.0"
     nunjucks: ">=3.2.3"
     parse5: ">=7.1.2"
     prismjs: ">=1.29.0"
-    pug: ">=3.0.2"
+    pug: ">=3.0.3"
     twig: ">=1.17.1"
-    webpack: ">=5.32.0"
+    webpack: ">=5.81.0"
   peerDependenciesMeta:
     ejs:
       optional: true
@@ -21703,7 +21694,7 @@ __metadata:
       optional: true
     twig:
       optional: true
-  checksum: 10/6e1456f580ab24bfbf28f00e2876a08013e2bf9ae67e6a99b87c9b58a186b980ae02b9319fc7f609466d51b6342afa16630ce9cc4d597f8a43bc9a3f4797c45d
+  checksum: 10/029795013e6d955febe14b63fa9d735ad17818f6944d94bbdda50820fe4df82e31662e6aa0d27a313291233e98ce1930b7f90e2923e6c6d06b86f140de81efd3
   languageName: node
   linkType: hard
 
@@ -26730,7 +26721,7 @@ __metadata:
     gulp-zip: "npm:^5.1.0"
     he: "npm:^1.2.0"
     history: "npm:^5.3.0"
-    html-bundler-webpack-plugin: "npm:^3.17.3"
+    html-bundler-webpack-plugin: "npm:^4.4.1"
     https-browserify: "npm:^1.0.0"
     human-standard-token-abi: "npm:^2.0.0"
     husky: "npm:^8.0.3"
@@ -26851,7 +26842,7 @@ __metadata:
     watchify: "npm:^4.0.0"
     web3-stream-provider: "npm:^5.0.0"
     webextension-polyfill: "npm:^0.8.0"
-    webpack: "npm:^5.91.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-dev-server: "npm:^5.0.3"
     ws: "npm:^8.17.1"
@@ -37468,20 +37459,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5, webpack@npm:^5.91.0":
-  version: 5.91.0
-  resolution: "webpack@npm:5.91.0"
+"webpack@npm:5, webpack@npm:^5.96.1":
+  version: 5.96.1
+  resolution: "webpack@npm:5.96.1"
   dependencies:
-    "@types/eslint-scope": "npm:^3.7.3"
-    "@types/estree": "npm:^1.0.5"
+    "@types/eslint-scope": "npm:^3.7.7"
+    "@types/estree": "npm:^1.0.6"
     "@webassemblyjs/ast": "npm:^1.12.1"
     "@webassemblyjs/wasm-edit": "npm:^1.12.1"
     "@webassemblyjs/wasm-parser": "npm:^1.12.1"
-    acorn: "npm:^8.7.1"
-    acorn-import-assertions: "npm:^1.9.0"
-    browserslist: "npm:^4.21.10"
+    acorn: "npm:^8.14.0"
+    browserslist: "npm:^4.24.0"
     chrome-trace-event: "npm:^1.0.2"
-    enhanced-resolve: "npm:^5.16.0"
+    enhanced-resolve: "npm:^5.17.1"
     es-module-lexer: "npm:^1.2.1"
     eslint-scope: "npm:5.1.1"
     events: "npm:^3.2.0"
@@ -37501,7 +37491,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10/647ca53c15fe0fa1af4396a7257d7a93cbea648d2685e565a11cc822a9e3ea9316345250987d75f02c0b45dae118814f094ec81908d1032e77a33cd6470b289e
+  checksum: 10/d3419ffd198252e1d0301bd0c072cee93172f3e47937c745aa8202691d2f5d529d4ba4a1965d1450ad89a1bcd3c1f70ae09e57232b0d01dd38d69c1060e964d5
   languageName: node
   linkType: hard
 

From e563cfa519ee000ed20919e0e09344cbbf8c256c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 6 Nov 2024 16:22:06 +0000
Subject: [PATCH 044/111] feat: adds solana feature, code fence (#28320)
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 the Solana snap feature, so that we can code fence it's logic:

`    ///: BEGIN:ONLY_INCLUDE_IF(solana)
`

## **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/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: Ulisses Ferreira <ulisses@hey.com>
---
 app/scripts/controllers/preferences-controller.ts         | 6 +++++-
 app/scripts/metamask-controller.js                        | 2 ++
 builds.yml                                                | 3 +++
 .../experimental-tab/experimental-tab.component.tsx       | 6 ++++--
 .../experimental-tab/experimental-tab.container.ts        | 8 ++++----
 ui/selectors/selectors.js                                 | 2 +-
 ui/store/actions.ts                                       | 2 +-
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index bc7d03155f75..b4ce3ca71e64 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -140,6 +140,8 @@ export type PreferencesControllerState = Omit<
   useRequestQueue: boolean;
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   watchEthereumAccountEnabled: boolean;
+  ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   solanaSupportEnabled: boolean;
   ///: END:ONLY_INCLUDE_IF
   bitcoinSupportEnabled: boolean;
@@ -185,7 +187,7 @@ export const getDefaultPreferencesControllerState =
     openSeaEnabled: true,
     securityAlertsEnabled: true,
     watchEthereumAccountEnabled: false,
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(solana)
     solanaSupportEnabled: false,
     ///: END:ONLY_INCLUDE_IF
     bitcoinSupportEnabled: false,
@@ -677,7 +679,9 @@ export class PreferencesController extends BaseController<
       state.watchEthereumAccountEnabled = watchEthereumAccountEnabled;
     });
   }
+  ///: END:ONLY_INCLUDE_IF
 
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   /**
    * Setter for the `solanaSupportEnabled` property.
    *
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e7e115e6ed7c..89d91f134ae2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3320,6 +3320,8 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setWatchEthereumAccountEnabled.bind(
           preferencesController,
         ),
+      ///: END:ONLY_INCLUDE_IF
+      ///: BEGIN:ONLY_INCLUDE_IF(solana)
       setSolanaSupportEnabled:
         preferencesController.setSolanaSupportEnabled.bind(
           preferencesController,
diff --git a/builds.yml b/builds.yml
index 1392950860e2..2442ad51475a 100644
--- a/builds.yml
+++ b/builds.yml
@@ -135,6 +135,9 @@ features:
   keyring-snaps:
     assets:
       - ./{app,shared,ui}/**/keyring-snaps/**
+  solana:
+    assets:
+      - ./{app,shared,ui}/**/solana/**
 
 # Env variables that are required for all types of builds
 #
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.tsx b/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
index 0771428474d5..d81eb04966a9 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.tsx
@@ -36,7 +36,7 @@ import { SurveyUrl } from '../../../../shared/constants/urls';
 type ExperimentalTabProps = {
   watchAccountEnabled: boolean;
   setWatchAccountEnabled: (value: boolean) => void;
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   solanaSupportEnabled: boolean;
   setSolanaSupportEnabled: (value: boolean) => void;
   ///: END:ONLY_INCLUDE_IF
@@ -373,7 +373,9 @@ export default class ExperimentalTab extends PureComponent<ExperimentalTabProps>
       </>
     );
   }
+  ///: END:ONLY_INCLUDE_IF
 
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   renderSolanaSupport() {
     const { t, trackEvent } = this.context;
     const { solanaSupportEnabled, setSolanaSupportEnabled } = this.props;
@@ -441,7 +443,7 @@ export default class ExperimentalTab extends PureComponent<ExperimentalTabProps>
           ///: END:ONLY_INCLUDE_IF
         }
         {
-          ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+          ///: BEGIN:ONLY_INCLUDE_IF(solana)
           this.renderSolanaSupport()
           ///: END:ONLY_INCLUDE_IF
         }
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.ts b/ui/pages/settings/experimental-tab/experimental-tab.container.ts
index e3be762afd1c..6de36b9de5c0 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.ts
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.ts
@@ -13,12 +13,12 @@ import {
   setRedesignedConfirmationsEnabled,
   setRedesignedTransactionsEnabled,
   setWatchEthereumAccountEnabled,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   setSolanaSupportEnabled,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../store/actions';
 import {
-  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
   getIsSolanaSupportEnabled,
   ///: END:ONLY_INCLUDE_IF
   getIsBitcoinSupportEnabled,
@@ -43,7 +43,7 @@ const mapStateToProps = (state: MetaMaskReduxState) => {
   const petnamesEnabled = getPetnamesEnabled(state);
   const featureNotificationsEnabled = getFeatureNotificationsEnabled(state);
   return {
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(solana)
     solanaSupportEnabled: getIsSolanaSupportEnabled(state),
     ///: END:ONLY_INCLUDE_IF
     watchAccountEnabled: getIsWatchEthereumAccountEnabled(state),
@@ -64,7 +64,7 @@ const mapDispatchToProps = (dispatch: MetaMaskReduxDispatch) => {
   return {
     setWatchAccountEnabled: (value: boolean) =>
       setWatchEthereumAccountEnabled(value),
-    ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+    ///: BEGIN:ONLY_INCLUDE_IF(solana)
     setSolanaSupportEnabled: (value: boolean) => setSolanaSupportEnabled(value),
     ///: END:ONLY_INCLUDE_IF
     setBitcoinSupportEnabled: (value: boolean) =>
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 8b44dd715aba..94d8f39252d8 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -2364,7 +2364,7 @@ export function getIsBitcoinSupportEnabled(state) {
   return state.metamask.bitcoinSupportEnabled;
 }
 
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+///: BEGIN:ONLY_INCLUDE_IF(solana)
 /**
  * Get the state of the `solanaSupportEnabled` flag.
  *
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 8018595371f4..4f66067a5759 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4999,7 +4999,7 @@ export async function setBitcoinTestnetSupportEnabled(value: boolean) {
   }
 }
 
-///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+///: BEGIN:ONLY_INCLUDE_IF(solana)
 export async function setSolanaSupportEnabled(value: boolean) {
   try {
     await submitRequestToBackground('setSolanaSupportEnabled', [value]);

From 264a4320e589a5f51455596eb88d6301c2d51931 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 6 Nov 2024 10:42:49 -0600
Subject: [PATCH 045/111] fix: Negate privacy mode in Send screen (#28248)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Upon verifying Privacy Mode, it appeared as though the implementation
was too aggressive in that it was hiding values on the Send flow. This
is undesirable. Additionally, we should hide the account asset value in
the Asset Details screen.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Turn on privacy mode by clicking the Eye on the home screen
2. Open the send flow, choose a recipient
3. See the values of the tokens to send as well as balance

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

<img width="407" alt="SCR-20241101-offl"
src="https://github.com/user-attachments/assets/d006d78f-841a-41e5-b37b-3abd9a8e8369">


## **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/components/app/currency-input/currency-input.js            | 1 +
 .../user-preferenced-currency-display.component.d.ts          | 1 +
 .../user-preferenced-currency-display.component.js            | 3 +++
 .../asset-picker-amount/asset-balance/asset-balance-text.tsx  | 3 +++
 .../ui/currency-display/currency-display.component.d.ts       | 1 +
 .../ui/currency-display/currency-display.component.js         | 4 +++-
 ui/pages/asset/components/asset-page.tsx                      | 3 +++
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index 43da00ad3ab0..da69f3cbbe70 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -222,6 +222,7 @@ export default function CurrencyInput({
         suffix={suffix}
         className="currency-input__conversion-component"
         displayValue={displayValue}
+        privacyModeExempt
       />
     );
   };
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 4db61d568f4a..ba465f1c5f08 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
@@ -16,6 +16,7 @@ export type UserPrefrencedCurrencyDisplayProps = OverridingUnion<
     showCurrencySuffix?: boolean;
     shouldCheckShowNativeToken?: boolean;
     isAggregatedFiatOverviewBalance?: boolean;
+    privacyModeExempt?: boolean;
   }
 >;
 
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
index 613b731d0a16..77157e4b5c95 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
@@ -28,6 +28,7 @@ export default function UserPreferencedCurrencyDisplay({
   showNative,
   showCurrencySuffix,
   shouldCheckShowNativeToken,
+  privacyModeExempt,
   ...restProps
 }) {
   // NOTE: When displaying currencies, we need the actual account to detect whether we're in a
@@ -83,6 +84,7 @@ export default function UserPreferencedCurrencyDisplay({
       numberOfDecimals={numberOfDecimals}
       prefixComponent={prefixComponent}
       suffix={showCurrencySuffix && !showEthLogo && currency}
+      privacyModeExempt={privacyModeExempt}
     />
   );
 }
@@ -126,6 +128,7 @@ const UserPreferencedCurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   shouldCheckShowNativeToken: PropTypes.bool,
+  privacyModeExempt: PropTypes.bool,
 };
 
 UserPreferencedCurrencyDisplay.propTypes =
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..fbf608deedd8 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
@@ -105,6 +105,7 @@ export function AssetBalanceText({
         currency={secondaryCurrency}
         numberOfDecimals={2}
         displayValue={`${formattedFiat}${errorText}`}
+        privacyModeExempt
       />
     );
   }
@@ -116,6 +117,7 @@ export function AssetBalanceText({
           {...commonProps}
           value={asset.balance}
           type={PRIMARY}
+          privacyModeExempt
         />
         {errorText ? (
           <Text
@@ -136,6 +138,7 @@ export function AssetBalanceText({
       <UserPreferencedCurrencyDisplay
         {...commonProps}
         displayValue={`${balanceString || ''}${errorText}`}
+        privacyModeExempt
       />
     );
   }
diff --git a/ui/components/ui/currency-display/currency-display.component.d.ts b/ui/components/ui/currency-display/currency-display.component.d.ts
index d8e1d6b60e1e..fd642cd4e6cd 100644
--- a/ui/components/ui/currency-display/currency-display.component.d.ts
+++ b/ui/components/ui/currency-display/currency-display.component.d.ts
@@ -25,6 +25,7 @@ export type CurrencyDisplayProps = OverridingUnion<
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     suffixProps?: Record<string, any>;
+    privacyModeExempt?: boolean;
   }
 >;
 
diff --git a/ui/components/ui/currency-display/currency-display.component.js b/ui/components/ui/currency-display/currency-display.component.js
index a0bb114409f6..a1b413dd6a7f 100644
--- a/ui/components/ui/currency-display/currency-display.component.js
+++ b/ui/components/ui/currency-display/currency-display.component.js
@@ -35,6 +35,7 @@ export default function CurrencyDisplay({
   textProps = {},
   suffixProps = {},
   isAggregatedFiatOverviewBalance = false,
+  privacyModeExempt,
   ...props
 }) {
   const { privacyMode } = useSelector(getPreferences);
@@ -76,7 +77,7 @@ export default function CurrencyDisplay({
         className="currency-display-component__text"
         ellipsis
         variant={TextVariant.inherit}
-        isHidden={privacyMode}
+        isHidden={!privacyModeExempt && privacyMode}
         data-testid="account-value-and-suffix"
         {...textProps}
       >
@@ -125,6 +126,7 @@ const CurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   isAggregatedFiatOverviewBalance: PropTypes.bool,
+  privacyModeExempt: PropTypes.bool,
 };
 
 CurrencyDisplay.propTypes = CurrencyDisplayPropTypes;
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index c70b60169edb..4fb294b17294 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -8,6 +8,7 @@ import {
   getCurrentCurrency,
   getIsBridgeChain,
   getIsSwapsChain,
+  getPreferences,
   getSelectedInternalAccount,
   getSwapsDefaultToken,
   getTokensMarketData,
@@ -102,6 +103,7 @@ const AssetPage = ({
   const conversionRate = useSelector(getConversionRate);
   const allMarketData = useSelector(getTokensMarketData);
   const isBridgeChain = useSelector(getIsBridgeChain);
+  const { privacyMode } = useSelector(getPreferences);
   const isBuyableChain = useSelector(getIsNativeTokenBuyable);
   const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
   const account = useSelector(getSelectedInternalAccount, isEqual);
@@ -196,6 +198,7 @@ const AssetPage = ({
             tokenImage={image}
             isOriginalTokenSymbol={asset.isOriginalNativeSymbol}
             isNativeCurrency={true}
+            privacyMode={privacyMode}
           />
         ) : (
           <TokenCell

From 87299bedaaeb28aae45f6f73206d173e91ab42af Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 6 Nov 2024 22:43:20 -0600
Subject: [PATCH 046/111] feat: Show network badge in detected tokens modal
 (#28231)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds the network badge to the listing of tokens detected

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Import an SRP that ERC20s
2. Click "Import tokens" in the banner
3. See network icons in the asset badge

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

<img width="356" alt="SCR-20241031-ovkc"
src="https://github.com/user-attachments/assets/ba934bad-8e7d-4c46-b47b-273030e81ae2">



## **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: Salim TOUBAL <salim.toubal@outlook.com>
---
 .../detected-token-details.js                 | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/ui/components/app/detected-token/detected-token-details/detected-token-details.js b/ui/components/app/detected-token/detected-token-details/detected-token-details.js
index 3fb3219630a1..fe8f12618305 100644
--- a/ui/components/app/detected-token/detected-token-details/detected-token-details.js
+++ b/ui/components/app/detected-token/detected-token-details/detected-token-details.js
@@ -1,14 +1,23 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-
-import { Box } from '../../../component-library';
-import Identicon from '../../../ui/identicon';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+  AvatarToken,
+  AvatarTokenSize,
+  BadgeWrapper,
+  Box,
+} from '../../../component-library';
 import DetectedTokenValues from '../detected-token-values/detected-token-values';
 import DetectedTokenAddress from '../detected-token-address/detected-token-address';
 import DetectedTokenAggregators from '../detected-token-aggregators/detected-token-aggregators';
 import { Display } from '../../../../helpers/constants/design-system';
-import { getTokenList } from '../../../../selectors';
+import {
+  getCurrentNetwork,
+  getTestNetworkBackgroundColor,
+  getTokenList,
+} from '../../../../selectors';
 
 const DetectedTokenDetails = ({
   token,
@@ -17,6 +26,8 @@ const DetectedTokenDetails = ({
 }) => {
   const tokenList = useSelector(getTokenList);
   const tokenData = tokenList[token.address?.toLowerCase()];
+  const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
+  const currentNetwork = useSelector(getCurrentNetwork);
 
   return (
     <Box
@@ -24,11 +35,25 @@ const DetectedTokenDetails = ({
       className="detected-token-details"
       marginBottom={4}
     >
-      <Identicon
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            size={AvatarNetworkSize.Xs}
+            name={currentNetwork?.nickname || ''}
+            src={currentNetwork?.rpcPrefs?.imageUrl}
+            backgroundColor={testNetworkBackgroundColor}
+          />
+        }
+        marginRight={2}
         className="detected-token-details__identicon"
-        address={token.address}
-        diameter={40}
-      />
+      >
+        <AvatarToken
+          name={token.symbol}
+          src={token.image}
+          size={AvatarTokenSize.Md}
+        />
+      </BadgeWrapper>
+
       <Box
         display={Display.Grid}
         marginLeft={2}
@@ -55,6 +80,7 @@ DetectedTokenDetails.propTypes = {
     symbol: PropTypes.string,
     iconUrl: PropTypes.string,
     aggregators: PropTypes.array,
+    image: PropTypes.string,
   }),
   handleTokenSelection: PropTypes.func.isRequired,
   tokensListDetected: PropTypes.object,

From 0064020643705a881ddb4904ff2503956e8d9302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Thu, 7 Nov 2024 10:23:46 +0000
Subject: [PATCH 047/111] chore: adds Solana snap to preinstall list (#28141)
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 the Solana snap to the preinstall list.

## **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/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/snaps/preinstalled-snaps.ts   |  6 ++++
 package.json                              |  1 +
 shared/lib/accounts/solana-wallet-snap.ts |  9 ++++++
 yarn.lock                                 | 38 ++++++++++++++++++++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 shared/lib/accounts/solana-wallet-snap.ts

diff --git a/app/scripts/snaps/preinstalled-snaps.ts b/app/scripts/snaps/preinstalled-snaps.ts
index c725a2cbd837..b596468853b2 100644
--- a/app/scripts/snaps/preinstalled-snaps.ts
+++ b/app/scripts/snaps/preinstalled-snaps.ts
@@ -6,6 +6,9 @@ import AccountWatcherSnap from '@metamask/account-watcher/dist/preinstalled-snap
 import BitcoinWalletSnap from '@metamask/bitcoin-wallet-snap/dist/preinstalled-snap.json';
 import PreinstalledExampleSnap from '@metamask/preinstalled-example-snap/dist/preinstalled-snap.json';
 ///: END:ONLY_INCLUDE_IF
+///: BEGIN:ONLY_INCLUDE_IF(solana)
+import SolanaWalletSnap from '@metamask/solana-wallet-snap/dist/preinstalled-snap.json';
+///: END:ONLY_INCLUDE_IF
 
 // The casts here are less than ideal but we expect the SnapController to validate the inputs.
 const PREINSTALLED_SNAPS = Object.freeze<PreinstalledSnap[]>([
@@ -16,6 +19,9 @@ const PREINSTALLED_SNAPS = Object.freeze<PreinstalledSnap[]>([
   BitcoinWalletSnap as unknown as PreinstalledSnap,
   PreinstalledExampleSnap as unknown as PreinstalledSnap,
   ///: END:ONLY_INCLUDE_IF
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
+  SolanaWalletSnap as unknown as PreinstalledSnap,
+  ///: END:ONLY_INCLUDE_IF
 ]);
 
 export default PREINSTALLED_SNAPS;
diff --git a/package.json b/package.json
index 14b38d504c87..b570cc6f9245 100644
--- a/package.json
+++ b/package.json
@@ -346,6 +346,7 @@
     "@metamask/snaps-rpc-methods": "^11.5.1",
     "@metamask/snaps-sdk": "^6.10.0",
     "@metamask/snaps-utils": "^8.5.1",
+    "@metamask/solana-wallet-snap": "^0.1.9",
     "@metamask/transaction-controller": "^38.1.0",
     "@metamask/user-operation-controller": "^13.0.0",
     "@metamask/utils": "^10.0.1",
diff --git a/shared/lib/accounts/solana-wallet-snap.ts b/shared/lib/accounts/solana-wallet-snap.ts
new file mode 100644
index 000000000000..1f6622c8bbdc
--- /dev/null
+++ b/shared/lib/accounts/solana-wallet-snap.ts
@@ -0,0 +1,9 @@
+import { SnapId } from '@metamask/snaps-sdk';
+// This dependency is still installed as part of the `package.json`, however
+// the Snap is being pre-installed only for Flask build (for the moment).
+import SolanaWalletSnap from '@metamask/solana-wallet-snap/dist/preinstalled-snap.json';
+
+export const SOLANA_WALLET_SNAP_ID: SnapId = SolanaWalletSnap.snapId as SnapId;
+
+export const SOLANA_WALLET_NAME: string =
+  SolanaWalletSnap.manifest.proposedName;
diff --git a/yarn.lock b/yarn.lock
index 9a54de8897d6..aa975513b90a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5575,6 +5575,23 @@ __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:^17.1.0, @metamask/keyring-controller@npm:^17.2.2":
   version: 17.2.2
   resolution: "@metamask/keyring-controller@npm:17.2.2"
@@ -6349,6 +6366,17 @@ __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
+  languageName: node
+  linkType: hard
+
 "@metamask/superstruct@npm:^3.0.0, @metamask/superstruct@npm:^3.1.0":
   version: 3.1.0
   resolution: "@metamask/superstruct@npm:3.1.0"
@@ -26550,6 +26578,7 @@ __metadata:
     "@metamask/snaps-rpc-methods": "npm:^11.5.1"
     "@metamask/snaps-sdk": "npm:^6.10.0"
     "@metamask/snaps-utils": "npm:^8.5.1"
+    "@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:^38.1.0"
@@ -37259,7 +37288,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webextension-polyfill@npm:>=0.10.0 <1.0, webextension-polyfill@npm:^0.10.0":
+"webextension-polyfill@npm:>=0.10.0 <1.0, webextension-polyfill@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "webextension-polyfill@npm:0.12.0"
+  checksum: 10/77e648b958b573ef075e75a0c180e2bbd74dee17b3145e86d21fcbb168c4999e4a311654fe634b8178997bee9b35ea5808d8d3d3e5ff2ad138f197f4f0ea75d9
+  languageName: node
+  linkType: hard
+
+"webextension-polyfill@npm:^0.10.0":
   version: 0.10.0
   resolution: "webextension-polyfill@npm:0.10.0"
   checksum: 10/51ff30ebed4b1aa802b7f0347f05021b2fe492078bb1a597223d43995fcee96e2da8f914a2f6e36f988c1877ed5ab36ca7077f2f3ab828955151a59e4c01bf7e

From bde47a637ecd3172bb9ac6877c815cdc97014596 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:01:00 +0700
Subject: [PATCH 048/111] refactor: rename
 SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST (#28337)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Rename `SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS` →
`SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST` to be more
explicit now that we are fetching the chain ids list from the Security
Provider API introduced in
https://github.com/MetaMask/metamask-extension/pull/25716

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

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2846
Related: https://github.com/MetaMask/metamask-extension/pull/25716

## **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.
---
 app/scripts/lib/ppom/ppom-util.ts     | 4 ++--
 shared/constants/security-provider.ts | 2 +-
 test/e2e/mock-e2e.js                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/ppom/ppom-util.ts b/app/scripts/lib/ppom/ppom-util.ts
index 7662c364b651..e8c54ee5eb53 100644
--- a/app/scripts/lib/ppom/ppom-util.ts
+++ b/app/scripts/lib/ppom/ppom-util.ts
@@ -11,7 +11,7 @@ import { SignatureController } from '@metamask/signature-controller';
 import {
   BlockaidReason,
   BlockaidResultType,
-  SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS,
+  SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST,
   SecurityAlertSource,
 } from '../../../../shared/constants/security-provider';
 import { SIGNING_METHODS } from '../../../../shared/constants/transaction';
@@ -123,7 +123,7 @@ export function handlePPOMError(
 }
 
 export async function isChainSupported(chainId: Hex): Promise<boolean> {
-  let supportedChainIds = SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS;
+  let supportedChainIds = SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST;
 
   try {
     if (isSecurityAlertsAPIEnabled()) {
diff --git a/shared/constants/security-provider.ts b/shared/constants/security-provider.ts
index e6fff53ee28a..082f68aa88de 100644
--- a/shared/constants/security-provider.ts
+++ b/shared/constants/security-provider.ts
@@ -89,7 +89,7 @@ export const FALSE_POSITIVE_REPORT_BASE_URL =
 
 export const SECURITY_PROVIDER_UTM_SOURCE = 'metamask-ppom';
 
-export const SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS: Hex[] = [
+export const SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST: Hex[] = [
   CHAIN_IDS.ARBITRUM,
   CHAIN_IDS.AVALANCHE,
   CHAIN_IDS.BASE,
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index 85636fcb9089..5d372f3389a3 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 
 const {
-  SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS,
+  SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST,
 } = require('../../shared/constants/security-provider');
 const {
   BRIDGE_DEV_API_BASE_URL,
@@ -160,7 +160,7 @@ async function setupMocking(
     .thenCallback(() => {
       return {
         statusCode: 200,
-        json: SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS,
+        json: SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST,
       };
     });
 

From 3401ef01c48343f9d2c6e6a16c36757f20f5e577 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 7 Nov 2024 12:21:19 +0000
Subject: [PATCH 049/111] fix: Updates to the simulations component (#28107)
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**

Updates the copy, layout and text color for 3 scenarios: No changes,
Generic Error and Fiat value not available as per design review.

<!--
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/28107?quickstart=1)

## **Related issues**

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

## **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="359" alt="Screenshot 2024-10-25 at 14 52 54"
src="https://github.com/user-attachments/assets/df189f0b-01c0-4f47-a59c-2e323fe6c8b3">

<img width="472" alt="Screenshot 2024-10-30 at 16 31 01"
src="https://github.com/user-attachments/assets/f57f1d95-aeb2-4900-ab9e-14fe448bcf68">

<img width="361" alt="Screenshot 2024-10-25 at 14 14 19"
src="https://github.com/user-attachments/assets/367e9351-3e81-4b42-8ec6-3f53a2e73f08">


## **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                 |  9 --
 app/_locales/el/messages.json                 |  9 --
 app/_locales/en/messages.json                 | 13 +--
 app/_locales/en_GB/messages.json              |  9 --
 app/_locales/es/messages.json                 |  9 --
 app/_locales/fr/messages.json                 |  9 --
 app/_locales/hi/messages.json                 |  9 --
 app/_locales/id/messages.json                 |  9 --
 app/_locales/ja/messages.json                 |  9 --
 app/_locales/ko/messages.json                 |  9 --
 app/_locales/pt/messages.json                 |  9 --
 app/_locales/ru/messages.json                 |  9 --
 app/_locales/tl/messages.json                 |  9 --
 app/_locales/tr/messages.json                 |  9 --
 app/_locales/vi/messages.json                 |  9 --
 app/_locales/zh_CN/messages.json              |  9 --
 .../simulation-details.spec.ts                |  4 +-
 .../info/personal-sign/personal-sign.tsx      | 92 ++++++++++++++++---
 .../simulation-details/fiat-display.test.tsx  |  3 -
 .../simulation-details/fiat-display.tsx       |  2 +-
 .../simulation-details.test.tsx               |  8 +-
 .../simulation-details/simulation-details.tsx | 30 ++++--
 .../confirm-transaction-base.test.js.snap     | 10 +-
 23 files changed, 116 insertions(+), 181 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 771deef4c28c..19c7731c778f 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Anmelden mit"
   },
-  "simulationDetailsFailed": {
-    "message": "Es ist ein Fehler beim Laden Ihrer Schätzung aufgetreten."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Nicht verfügbar"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Sie erhalten"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Keine Änderungen für Ihre Wallet prognostiziert."
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Sie senden"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Ressourcen"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Sie melden sich bei einer Website an und es sind keine Änderungen an Ihrem Konto vorgesehen."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 7ae594c8b9b8..ac4542893959 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Σύνδεση με"
   },
-  "simulationDetailsFailed": {
-    "message": "Υπήρξε σφάλμα στη φόρτωση της εκτίμησής σας."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Μη διαθέσιμο"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Λαμβάνετε"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Δεν προβλέπονται αλλαγές για το πορτοφόλι σας"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Στέλνετε"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Πόροι"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Συνδέεστε σε έναν ιστότοπο και δεν προβλέπονται αλλαγές στον λογαριασμό σας."
-  },
   "siweURI": {
     "message": "Διεύθυνση URL"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index ab6b06411731..62dda6c29ef0 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4961,17 +4961,14 @@
   "simulationDetailsERC20ApproveDesc": {
     "message": "You're giving someone else permission to spend this amount from your account."
   },
-  "simulationDetailsFailed": {
-    "message": "There was an error loading your estimation."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Not Available"
   },
   "simulationDetailsIncomingHeading": {
     "message": "You receive"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "No changes predicted for your wallet"
+  "simulationDetailsNoChanges": {
+    "message": "No changes"
   },
   "simulationDetailsOutgoingHeading": {
     "message": "You send"
@@ -4995,6 +4992,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "This transaction is likely to fail"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Unavailable"
+  },
   "simulationErrorMessageV2": {
     "message": "We were not able to estimate gas. There might be an error in the contract and this transaction may fail."
   },
@@ -5016,9 +5016,6 @@
   "siweResources": {
     "message": "Resources"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "You’re signing into a site and there are no predicted changes to your account."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index e8eb1e58ea71..8dd2e32dac39 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -4711,18 +4711,12 @@
   "signingInWith": {
     "message": "Signing in with"
   },
-  "simulationDetailsFailed": {
-    "message": "There was an error loading your estimation."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Not Available"
   },
   "simulationDetailsIncomingHeading": {
     "message": "You receive"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "No changes predicted for your wallet"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "You send"
   },
@@ -4760,9 +4754,6 @@
   "siweResources": {
     "message": "Resources"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "You’re signing into a site and there are no predicted changes to your account."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 0f774d8f6ba2..1d23b736fbfd 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -4537,18 +4537,12 @@
   "signingInWith": {
     "message": "Iniciar sesión con"
   },
-  "simulationDetailsFailed": {
-    "message": "Se produjo un error al cargar su estimación."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "No disponible"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Usted recibe"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "No se prevén cambios para su monedero"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Envía"
   },
@@ -4586,9 +4580,6 @@
   "siweResources": {
     "message": "Recursos"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Está iniciando sesión en un sitio y no se prevén cambios en su cuenta."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 985dfd44c9dd..e9b8fd588b89 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Se connecter avec"
   },
-  "simulationDetailsFailed": {
-    "message": "Une erreur s’est produite lors du chargement de l’estimation."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Non disponible"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Vous recevez"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Aucun changement prévu pour votre portefeuille"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Vous envoyez"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Ressources"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Vous êtes en train de vous connecter à un site, aucun changement ne devrait être apporté à votre compte."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 540023a75fac..9b2c06f96c11 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "के साथ साइन इन करना"
   },
-  "simulationDetailsFailed": {
-    "message": "आपका एस्टीमेशन लोड करने में गड़बड़ी हुई।"
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "उपलब्ध नहीं है"
   },
   "simulationDetailsIncomingHeading": {
     "message": "आप पाते हैं"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "आपके वॉलेट के लिए किसी बदलाव का प्रेडिक्शन नहीं किया गया है"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "आप भेजते हैं"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "संसाधन"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "आप किसी साइट पर साइन इन कर रहे हैं और आपके अकाउंट में कोई अनुमानित परिवर्तन नहीं हैं।"
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 81f7d2a9c633..1331d7b9c482 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Masuk dengan"
   },
-  "simulationDetailsFailed": {
-    "message": "Terjadi kesalahan saat memuat estimasi Anda."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Tidak Tersedia"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Anda menerima"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Tidak ada perubahan yang terprediksi untuk dompet Anda"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Anda mengirim"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Sumber daya"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Anda masuk ke sebuah situs dan tidak ada perkiraan perubahan pada akun Anda."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 5787bb88c397..3107eb3cb152 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "サインイン方法:"
   },
-  "simulationDetailsFailed": {
-    "message": "予測結果の読み込み中にエラーが発生しました。"
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "利用できません"
   },
   "simulationDetailsIncomingHeading": {
     "message": "受取額"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "ウォレット残高の増減は予測されていません"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "送金額"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "リソース"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "サイトにサインインしようとしていて、予想されるアカウントの変更はありません。"
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 32d7bd4399b5..6dc468cdd5ef 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "다음으로 로그인:"
   },
-  "simulationDetailsFailed": {
-    "message": "추정치를 불러오는 동안 오류가 발생했습니다."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "이용할 수 없음"
   },
   "simulationDetailsIncomingHeading": {
     "message": "받음:"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "지갑에 예상 변동 사항 없음"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "보냄:"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "리소스"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "사이트에 로그인 중이며 계정에 예상되는 변경 사항이 없습니다."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 4eecb941d36f..03f41c1c62b8 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Assinando com"
   },
-  "simulationDetailsFailed": {
-    "message": "Houve um erro ao carregar sua estimativa."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Não disponível"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Você recebe"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Nenhuma alteração prevista para sua carteira"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Você envia"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Recursos"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Você está fazendo login em um site e não há alterações previstas em sua conta."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index ce53cc239de5..e56afc418785 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Вход с помощью"
   },
-  "simulationDetailsFailed": {
-    "message": "Не удалось загрузить прогноз."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Недоступно"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Вы получаете"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Никаких изменений в вашем кошельке не прогнозируется"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Вы отправляете"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Ресурсы"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Вы входите на сайт, и в вашем счете не происходит никаких прогнозируемых изменений."
-  },
   "siweURI": {
     "message": "URL-адрес"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 8909ac662e34..af56d958c313 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Nagsa-sign in gamit ang"
   },
-  "simulationDetailsFailed": {
-    "message": "Mayroong error sa pag-load ng iyong pagtataya."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Hindi Available"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Natanggap mo"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Walang pagbabagong nahulaan para sa iyong wallet"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Nagpadala ka"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Mga Mapagkukunan"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Ikaw ay nagsa-sign in sa isang site at walang mga inaasahang pagbabago sa iyong account."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 8c4e44d3192e..6732513395d8 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Şununla giriş yap:"
   },
-  "simulationDetailsFailed": {
-    "message": "Tahmininiz yüklenirken bir hata oldu."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Mevcut Değil"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Aldığınız"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Cüzdanınız için değişiklik öngörülmüyor"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Gönderdiğiniz"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Kaynaklar"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Bir siteye giriş yapıyorsunuz ve hesabınızda öngörülen herhangi bir değişiklik yok."
-  },
   "siweURI": {
     "message": "URL adresi"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index b741fe6eb536..9f6ff5119366 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "Đăng nhập bằng"
   },
-  "simulationDetailsFailed": {
-    "message": "Đã xảy ra lỗi khi tải kết quả ước tính."
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "Không có sẵn"
   },
   "simulationDetailsIncomingHeading": {
     "message": "Bạn nhận được"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "Ví của bạn dự kiến không có thay đổi nào"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "Bạn gửi"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "Tài nguyên"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "Bạn đang đăng nhập vào một trang web và dự kiến không có thay đổi nào đối với tài khoản của bạn."
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index e5695cdfaecf..eef758dacdad 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -4540,18 +4540,12 @@
   "signingInWith": {
     "message": "使用以下登录方式"
   },
-  "simulationDetailsFailed": {
-    "message": "加载估算时出错。"
-  },
   "simulationDetailsFiatNotAvailable": {
     "message": "不可用"
   },
   "simulationDetailsIncomingHeading": {
     "message": "您收到"
   },
-  "simulationDetailsNoBalanceChanges": {
-    "message": "预计您的钱包不会发生变化"
-  },
   "simulationDetailsOutgoingHeading": {
     "message": "您发送"
   },
@@ -4589,9 +4583,6 @@
   "siweResources": {
     "message": "资源"
   },
-  "siweSignatureSimulationDetailInfo": {
-    "message": "您正在登录某个网站，并且您的账户没有预期变化。"
-  },
   "siweURI": {
     "message": "URL"
   },
diff --git a/test/e2e/tests/simulation-details/simulation-details.spec.ts b/test/e2e/tests/simulation-details/simulation-details.spec.ts
index 46f4cdb5860a..bbac41b5a1a1 100644
--- a/test/e2e/tests/simulation-details/simulation-details.spec.ts
+++ b/test/e2e/tests/simulation-details/simulation-details.spec.ts
@@ -215,7 +215,7 @@ describe('Simulation Details', () => {
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
         await driver.findElement({
           css: '[data-testid="simulation-details-layout"]',
-          text: 'No changes predicted for your wallet',
+          text: 'No changes',
         });
       },
     );
@@ -276,7 +276,7 @@ describe('Simulation Details', () => {
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
         await driver.findElement({
           css: '[data-testid="simulation-details-layout"]',
-          text: 'There was an error loading your estimation',
+          text: 'Unavailable',
         });
       },
     );
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
index 5eb798439ca8..5c0af68742c5 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.tsx
@@ -2,24 +2,42 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 
 import {
-  ConfirmInfoRow,
   ConfirmInfoRowAddress,
   ConfirmInfoRowText,
   ConfirmInfoRowUrl,
 } from '../../../../../../components/app/confirm/info/row';
+import { ConfirmInfoAlertRow } from '../../../../../../components/app/confirm/info/row/alert-row/alert-row';
 import { RowAlertKey } from '../../../../../../components/app/confirm/info/row/constants';
-import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { useConfirmContext } from '../../../../context/confirm';
+import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
+import {
+  Box,
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+} from '../../../../../../components/component-library';
+import Tooltip from '../../../../../../components/ui/tooltip';
+import {
+  AlignItems,
+  BorderColor,
+  BorderRadius,
+  Display,
+  FlexDirection,
+  IconColor,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../../../../helpers/constants/design-system';
+import { isSnapId } from '../../../../../../helpers/utils/snaps';
 import {
   hexToText,
   sanitizeString,
 } from '../../../../../../helpers/utils/util';
-import { SignatureRequestType } from '../../../../types/confirm';
+import { useI18nContext } from '../../../../../../hooks/useI18nContext';
+import { useConfirmContext } from '../../../../context/confirm';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
+import { SignatureRequestType } from '../../../../types/confirm';
 import { isSIWESignatureRequest } from '../../../../utils';
-import { ConfirmInfoAlertRow } from '../../../../../../components/app/confirm/info/row/alert-row/alert-row';
-import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
-import { isSnapId } from '../../../../../../helpers/utils/snaps';
 import { SIWESignInfo } from './siwe-sign';
 
 const PersonalSignInfo: React.FC = () => {
@@ -49,16 +67,66 @@ const PersonalSignInfo: React.FC = () => {
     }
   }
 
+  const SimulationDetailsKey = (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Row}
+      alignItems={AlignItems.center}
+      gap={1}
+    >
+      <Text variant={TextVariant.bodyMdMedium}>
+        {t('simulationDetailsTitle')}
+      </Text>
+      <Tooltip
+        interactive
+        position="top"
+        containerClassName="info-tooltip__tooltip-container"
+        tooltipInnerClassName="info-tooltip__tooltip-content"
+        tooltipArrowClassName="info-tooltip__top-tooltip-arrow"
+        html={t('simulationDetailsTitleTooltip')}
+        theme="tippy-tooltip-info"
+        style={{ display: Display.Flex }}
+      >
+        <Icon
+          name={IconName.Question}
+          marginLeft={1}
+          color={IconColor.iconMuted}
+          size={IconSize.Sm}
+        />
+      </Tooltip>
+    </Box>
+  );
+
+  const SimulationDetailsValue = (
+    <Text color={TextColor.textAlternative} variant={TextVariant.bodyMd}>
+      {t('simulationDetailsNoChanges')}
+    </Text>
+  );
+
   return (
     <>
       {isSIWE && useTransactionSimulations && (
         <ConfirmInfoSection>
-          <ConfirmInfoRow
-            label={t('simulationDetailsTitle')}
-            tooltip={t('simulationDetailsTitleTooltip')}
+          <Box
+            data-testid="simulation-details-layout"
+            className="simulation-details-layout"
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
+            borderRadius={BorderRadius.LG}
+            borderColor={BorderColor.transparent}
+            padding={2}
+            gap={3}
           >
-            <ConfirmInfoRowText text={t('siweSignatureSimulationDetailInfo')} />
-          </ConfirmInfoRow>
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Row}
+              alignItems={AlignItems.center}
+              justifyContent={JustifyContent.spaceBetween}
+            >
+              {SimulationDetailsKey}
+              {SimulationDetailsValue}
+            </Box>
+          </Box>
         </ConfirmInfoSection>
       )}
       <ConfirmInfoSection>
diff --git a/ui/pages/confirmations/components/simulation-details/fiat-display.test.tsx b/ui/pages/confirmations/components/simulation-details/fiat-display.test.tsx
index 922a2e414916..7a91ba129d6b 100644
--- a/ui/pages/confirmations/components/simulation-details/fiat-display.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/fiat-display.test.tsx
@@ -58,7 +58,6 @@ describe('FiatDisplay', () => {
   describe('IndividualFiatDisplay', () => {
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
-      [FIAT_UNAVAILABLE, 'Not Available'],
       [100, '$100'],
       [-100, '$100'],
     ])(
@@ -84,8 +83,6 @@ describe('FiatDisplay', () => {
   describe('TotalFiatDisplay', () => {
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each([
-      [[FIAT_UNAVAILABLE, FIAT_UNAVAILABLE], 'Not Available'],
-      [[], 'Not Available'],
       [[100, 200, FIAT_UNAVAILABLE, 300], 'Total = $600'],
       [[-100, -200, FIAT_UNAVAILABLE, -300], 'Total = $600'],
     ])(
diff --git a/ui/pages/confirmations/components/simulation-details/fiat-display.tsx b/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
index ac3fcebcc159..d7ec958f2a5b 100644
--- a/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
+++ b/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
@@ -50,7 +50,7 @@ export const IndividualFiatDisplay: React.FC<{
   }
 
   if (fiatAmount === FIAT_UNAVAILABLE) {
-    return <FiatNotAvailableDisplay />;
+    return null;
   }
   const absFiat = Math.abs(fiatAmount);
   const fiatDisplayValue = fiatFormatter(absFiat, { shorten });
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
index 339ffbdd6a1a..9294f7d1b5b5 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
@@ -101,17 +101,13 @@ describe('SimulationDetails', () => {
     renderSimulationDetails({
       error: { message: 'Unknown error' },
     });
-    expect(
-      screen.getByText(/error loading your estimation/u),
-    ).toBeInTheDocument();
+    expect(screen.getByText(/Unavailable/u)).toBeInTheDocument();
   });
 
   it('renders empty content when there are no balance changes', () => {
     renderSimulationDetails({});
 
-    expect(
-      screen.getByText(/No changes predicted for your wallet/u),
-    ).toBeInTheDocument();
+    expect(screen.getByText(/No changes/u)).toBeInTheDocument();
   });
 
   it('passes the correct properties to BalanceChangeList components', () => {
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 382fcb180f82..57ee1f2ff3fb 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -62,17 +62,23 @@ const ErrorContent: React.FC<{ error: SimulationError }> = ({ error }) => {
   function getMessage() {
     return error.code === SimulationErrorCode.Reverted
       ? t('simulationDetailsTransactionReverted')
-      : t('simulationDetailsFailed');
+      : t('simulationDetailsUnavailable');
   }
 
   return (
     <Text
-      color={TextColor.warningDefault}
+      color={
+        error.code === SimulationErrorCode.Reverted
+          ? TextColor.warningDefault
+          : TextColor.textDefault
+      }
       variant={TextVariant.bodyMd}
       display={Display.Flex}
       alignItems={AlignItems.center}
     >
-      <Icon name={IconName.Warning} marginInlineEnd={1} />
+      {error.code === SimulationErrorCode.Reverted && (
+        <Icon name={IconName.Warning} marginInlineEnd={1} />
+      )}
       {getMessage()}
     </Text>
   );
@@ -84,8 +90,8 @@ const ErrorContent: React.FC<{ error: SimulationError }> = ({ error }) => {
 const EmptyContent: React.FC = () => {
   const t = useI18nContext();
   return (
-    <Text color={TextColor.textAlternative} variant={TextVariant.bodyMd}>
-      {t('simulationDetailsNoBalanceChanges')}
+    <Text color={TextColor.textDefault} variant={TextVariant.bodyMd}>
+      {t('simulationDetailsNoChanges')}
     </Text>
   );
 };
@@ -260,12 +266,19 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
   }
 
   if (error) {
+    const inHeaderProp = error.code !== SimulationErrorCode.Reverted && {
+      inHeader: <ErrorContent error={error} />,
+    };
+
     return (
       <SimulationDetailsLayout
         isTransactionsRedesign={isTransactionsRedesign}
         transactionId={transactionId}
+        {...inHeaderProp}
       >
-        <ErrorContent error={error} />
+        {error.code === SimulationErrorCode.Reverted && (
+          <ErrorContent error={error} />
+        )}
       </SimulationDetailsLayout>
     );
   }
@@ -277,9 +290,8 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
       <SimulationDetailsLayout
         isTransactionsRedesign={isTransactionsRedesign}
         transactionId={transactionId}
-      >
-        <EmptyContent />
-      </SimulationDetailsLayout>
+        inHeader={<EmptyContent />}
+      />
     );
   }
 
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 3bd2313850a4..5cdbdd5de6a5 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
@@ -337,12 +337,12 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
                     </div>
                   </div>
                 </div>
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+                >
+                  No changes
+                </p>
               </div>
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
-              >
-                No changes predicted for your wallet
-              </p>
             </div>
             <div
               class="transaction-detail"

From 765c62e33a22e91db9f62de4db45d816334e0fa2 Mon Sep 17 00:00:00 2001
From: Kanthesha Devaramane <kanthesha.devaramane@consensys.net>
Date: Thu, 7 Nov 2024 14:40:43 +0000
Subject: [PATCH 050/111] feat: Convert mmi controller to a non-controller
 (#27983)
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 bring MMIController up to date with our latest controller
patterns.

After review, it turns out that MMIController does not have any state
and therefore should not inherit from BaseController (or anything, for
that matter).

<!--
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/27983?quickstart=1)

## **Related issues**

Fixes: #25926

## **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**

- [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.
---
 .../controllers/mmi-controller.test.ts        |  91 ++++++++++------
 app/scripts/controllers/mmi-controller.ts     | 100 ++++++++++--------
 app/scripts/metamask-controller.js            |   6 +-
 shared/constants/mmi-controller.ts            |  56 ++++++++--
 4 files changed, 165 insertions(+), 88 deletions(-)

diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
index 64bc46132724..479c4cb0f14d 100644
--- a/app/scripts/controllers/mmi-controller.test.ts
+++ b/app/scripts/controllers/mmi-controller.test.ts
@@ -17,13 +17,14 @@ import {
   NETWORK_TYPES,
   TEST_NETWORK_TICKER_MAP,
 } from '../../../shared/constants/network';
-import MMIController from './mmi-controller';
+import { MMIController, AllowedActions } from './mmi-controller';
 import { AppStateController } from './app-state-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { mmiKeyringBuilderFactory } from '../mmi-keyring-builder-factory';
 import MetaMetricsController from './metametrics';
 import { ETH_EOA_METHODS } from '../../../shared/constants/eth-methods';
 import { mockNetworkState } from '../../../test/stub/networks';
+import { InfuraNetworkType } from '@metamask/controller-utils';
 import { API_REQUEST_LOG_EVENT } from '@metamask-institutional/sdk';
 
 jest.mock('@metamask-institutional/portfolio-dashboard', () => ({
@@ -39,6 +40,21 @@ jest.mock('./permissions', () => ({
   }),
 }));
 
+export const createMockNetworkConfiguration = (
+  override?: Partial<NetworkConfiguration>,
+): NetworkConfiguration => {
+  return {
+    chainId: CHAIN_IDS.SEPOLIA,
+    blockExplorerUrls: [],
+    defaultRpcEndpointIndex: 0,
+    name: 'Mock Network',
+    nativeCurrency: 'MOCK TOKEN',
+    rpcEndpoints: [],
+    defaultBlockExplorerUrlIndex: 0,
+    ...override,
+  };
+};
+
 const mockAccount = {
   address: '0x758b8178a9A4B7206d1f648c4a77C515Cbac7001',
   id: 'mock-id',
@@ -73,10 +89,10 @@ describe('MMIController', function () {
     mmiConfigurationController,
     controllerMessenger,
     accountsController,
-    networkController,
     keyringController,
     metaMetricsController,
-    custodyController;
+    custodyController,
+    mmiControllerMessenger;
 
   beforeEach(async function () {
     const mockMessenger = {
@@ -89,22 +105,10 @@ describe('MMIController', function () {
       subscribe: jest.fn(),
     };
 
-    networkController = new NetworkController({
-      messenger: new ControllerMessenger().getRestricted({
-        name: 'NetworkController',
-        allowedEvents: [
-          'NetworkController:stateChange',
-          'NetworkController:networkWillChange',
-          'NetworkController:networkDidChange',
-          'NetworkController:infuraIsBlocked',
-          'NetworkController:infuraIsUnblocked',
-        ],
-      }),
-      state: mockNetworkState({ chainId: CHAIN_IDS.SEPOLIA }),
-      infuraProjectId: 'mock-infura-project-id',
-    });
-
-    controllerMessenger = new ControllerMessenger();
+    const controllerMessenger = new ControllerMessenger<
+    AllowedActions,
+    never
+  >();
 
     accountsController = new AccountsController({
       messenger: controllerMessenger.getRestricted({
@@ -212,7 +216,31 @@ describe('MMIController', function () {
       onNetworkDidChange: jest.fn(),
     });
 
-    const mmiControllerMessenger = controllerMessenger.getRestricted({
+    controllerMessenger.registerActionHandler(
+      'NetworkController:getState',
+      jest.fn().mockReturnValue(mockNetworkState({ chainId: CHAIN_IDS.SEPOLIA })),
+    );
+
+    controllerMessenger.registerActionHandler(
+      'NetworkController:setActiveNetwork',
+      InfuraNetworkType['sepolia'],
+    );
+
+    controllerMessenger.registerActionHandler(
+      'NetworkController:getNetworkClientById',
+      jest.fn().mockReturnValue({
+        configuration: {
+          chainId: CHAIN_IDS.SEPOLIA,
+        }
+      }),
+    );
+
+    controllerMessenger.registerActionHandler(
+      'NetworkController:getNetworkConfigurationByChainId',
+      jest.fn().mockReturnValue(createMockNetworkConfiguration()),
+    );
+
+    mmiControllerMessenger = controllerMessenger.getRestricted({
       name: 'MMIController',
       allowedActions: [
         'AccountsController:getAccountByAddress',
@@ -220,6 +248,10 @@ describe('MMIController', function () {
         'AccountsController:listAccounts',
         'AccountsController:getSelectedAccount',
         'AccountsController:setSelectedAccount',
+        'NetworkController:getState',
+        'NetworkController:setActiveNetwork',
+        'NetworkController:getNetworkClientById',
+        'NetworkController:getNetworkConfigurationByChainId'
       ],
     });
 
@@ -253,7 +285,6 @@ describe('MMIController', function () {
           })
         }
       }),
-      networkController,
       permissionController,
       custodyController,
       metaMetricsController,
@@ -507,9 +538,7 @@ describe('MMIController', function () {
       CUSTODIAN_TYPES['CUSTODIAN-TYPE'] = {
         keyringClass: { type: 'mock-keyring-class' },
       };
-      mmiController.messenger.call = jest
-        .fn()
-        .mockReturnValue({ address: '0x1' });
+      jest.spyOn(mmiControllerMessenger, 'call').mockReturnValue({ address: '0x1' });
       mmiController.custodyController.getCustodyTypeByAddress = jest
         .fn()
         .mockReturnValue('custodian-type');
@@ -628,9 +657,7 @@ describe('MMIController', function () {
       mmiController.custodyController.getAccountDetails = jest
         .fn()
         .mockReturnValue({});
-      mmiController.messenger.call = jest
-        .fn()
-        .mockReturnValue([mockAccount, mockAccount2]);
+        jest.spyOn(mmiControllerMessenger, 'call').mockReturnValue([mockAccount, mockAccount2]);
       mmiController.mmiConfigurationController.store.getState = jest
         .fn()
         .mockReturnValue({
@@ -701,7 +728,7 @@ describe('MMIController', function () {
 
   describe('handleMmiCheckIfTokenIsPresent', () => {
     it('should check if a token is present', async () => {
-      mmiController.messenger.call = jest
+      mmiController.messagingSystem.call = jest
         .fn()
         .mockReturnValue({ address: '0x1' });
       mmiController.custodyController.getCustodyTypeByAddress = jest
@@ -733,7 +760,7 @@ describe('MMIController', function () {
 
   describe('handleMmiDashboardData', () => {
     it('should return internalAccounts as identities', async () => {
-      const controllerMessengerSpy = jest.spyOn(controllerMessenger, 'call');
+      const controllerMessengerSpy = jest.spyOn(mmiControllerMessenger, 'call');
       await mmiController.handleMmiDashboardData();
 
       expect(controllerMessengerSpy).toHaveBeenCalledWith(
@@ -811,7 +838,7 @@ describe('MMIController', function () {
 
   describe('setAccountAndNetwork', () => {
     it('should set a new selected account if the selectedAddress and the address from the arguments is different', async () => {
-      const selectedAccountSpy = jest.spyOn(controllerMessenger, 'call');
+      const selectedAccountSpy = jest.spyOn(mmiControllerMessenger, 'call');
       await mmiController.setAccountAndNetwork(
         'mock-origin',
         mockAccount2.address,
@@ -829,14 +856,14 @@ describe('MMIController', function () {
     });
 
     it('should not set a new selected account the accounts are the same', async () => {
-      const selectedAccountSpy = jest.spyOn(controllerMessenger, 'call');
+      const selectedAccountSpy = jest.spyOn(mmiControllerMessenger, 'call');
       await mmiController.setAccountAndNetwork(
         'mock-origin',
         mockAccount.address,
         '0x1',
       );
 
-      expect(selectedAccountSpy).toHaveBeenCalledTimes(1);
+      expect(selectedAccountSpy).toHaveBeenCalledTimes(4);
       const selectedAccount = accountsController.getSelectedAccount();
       expect(selectedAccount.id).toBe(mockAccount.id);
     });
diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index 65cdac69ba0b..ac8de8b76656 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -1,4 +1,3 @@
-import EventEmitter from 'events';
 import log from 'loglevel';
 import { captureException } from '@sentry/browser';
 import {
@@ -21,13 +20,13 @@ import { IApiCallLogEntry } from '@metamask-institutional/types';
 import { TransactionUpdateController } from '@metamask-institutional/transaction-update';
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { KeyringTypes } from '@metamask/keyring-controller';
+import { NetworkState } from '@metamask/network-controller';
 import {
   MessageParamsPersonal,
   MessageParamsTyped,
   SignatureController,
 } from '@metamask/signature-controller';
 import { OriginalRequest } from '@metamask/message-manager';
-import { NetworkController } from '@metamask/network-controller';
 import { InternalAccount } from '@metamask/keyring-api';
 import { toHex } from '@metamask/controller-utils';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
@@ -41,15 +40,12 @@ import {
   Label,
   Signature,
   ConnectionRequest,
+  MMIControllerMessenger,
 } from '../../../shared/constants/mmi-controller';
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import { getCurrentChainId } from '../../../ui/selectors';
 import MetaMetricsController from './metametrics';
 import { getPermissionBackgroundApiMethods } from './permissions';
 import AccountTrackerController from './account-tracker-controller';
 import { AppStateController } from './app-state-controller';
-import { PreferencesController } from './preferences-controller';
 
 type UpdateCustodianTransactionsParameters = {
   keyring: CustodyKeyring;
@@ -64,7 +60,7 @@ type UpdateCustodianTransactionsParameters = {
   setTxHash: (txId: string, txHash: string) => void;
 };
 
-export default class MMIController extends EventEmitter {
+export class MMIController {
   public opts: MMIControllerOptions;
 
   public mmiConfigurationController: MmiConfigurationController;
@@ -73,8 +69,6 @@ export default class MMIController extends EventEmitter {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public keyringController: any;
 
-  public preferencesController: PreferencesController;
-
   public appStateController: AppStateController;
 
   public transactionUpdateController: TransactionUpdateController;
@@ -93,7 +87,7 @@ export default class MMIController extends EventEmitter {
 
   private metaMetricsController: MetaMetricsController;
 
-  private networkController: NetworkController;
+  #networkControllerState: NetworkState;
 
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -101,9 +95,7 @@ export default class MMIController extends EventEmitter {
 
   private signatureController: SignatureController;
 
-  // TODO: Replace `any` with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private messenger: any;
+  private messagingSystem: MMIControllerMessenger;
 
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -139,13 +131,10 @@ export default class MMIController extends EventEmitter {
   };
 
   constructor(opts: MMIControllerOptions) {
-    super();
-
     this.opts = opts;
-    this.messenger = opts.messenger;
+    this.messagingSystem = opts.messenger;
     this.mmiConfigurationController = opts.mmiConfigurationController;
     this.keyringController = opts.keyringController;
-    this.preferencesController = opts.preferencesController;
     this.appStateController = opts.appStateController;
     this.transactionUpdateController = opts.transactionUpdateController;
     this.custodyController = opts.custodyController;
@@ -153,7 +142,6 @@ export default class MMIController extends EventEmitter {
     this.getPendingNonce = opts.getPendingNonce;
     this.accountTrackerController = opts.accountTrackerController;
     this.metaMetricsController = opts.metaMetricsController;
-    this.networkController = opts.networkController;
     this.permissionController = opts.permissionController;
     this.signatureController = opts.signatureController;
     this.platform = opts.platform;
@@ -214,6 +202,10 @@ export default class MMIController extends EventEmitter {
         this.setConnectionRequest(payload);
       },
     );
+
+    this.#networkControllerState = this.messagingSystem.call(
+      'NetworkController:getState',
+    );
   } // End of constructor
 
   async persistKeyringsAfterRefreshTokenChange() {
@@ -402,7 +394,10 @@ export default class MMIController extends EventEmitter {
     // Check if any address is already added
     if (
       newAccounts.some((address) =>
-        this.messenger.call('AccountsController:getAccountByAddress', address),
+        this.messagingSystem.call(
+          'AccountsController:getAccountByAddress',
+          address,
+        ),
       )
     ) {
       throw new Error('Cannot import duplicate accounts');
@@ -502,15 +497,17 @@ export default class MMIController extends EventEmitter {
         // If the label is defined
         if (label) {
           // Set the label for the address
-          const account = this.messenger.call(
+          const account = this.messagingSystem.call(
             'AccountsController:getAccountByAddress',
             address,
           );
-          this.messenger.call(
-            'AccountsController:setAccountName',
-            account.id,
-            label,
-          );
+          if (account) {
+            this.messagingSystem.call(
+              'AccountsController:setAccountName',
+              account.id,
+              label,
+            );
+          }
         }
       }
     });
@@ -552,7 +549,7 @@ export default class MMIController extends EventEmitter {
   ) {
     let currentCustodyType: string = '';
     if (!custodianType) {
-      const { address } = this.messenger.call(
+      const { address } = this.messagingSystem.call(
         'AccountsController:getSelectedAccount',
       );
       currentCustodyType = this.custodyController.getCustodyTypeByAddress(
@@ -637,7 +634,7 @@ export default class MMIController extends EventEmitter {
 
   // Based on a custodian name, get all the tokens associated with that custodian
   async getCustodianJWTList(custodianEnvName: string) {
-    const internalAccounts = this.messenger.call(
+    const internalAccounts = this.messagingSystem.call(
       'AccountsController:listAccounts',
     );
 
@@ -736,7 +733,8 @@ export default class MMIController extends EventEmitter {
 
     const currentAddress =
       address ||
-      this.messenger.call('AccountsController:getSelectedAccount').address;
+      this.messagingSystem.call('AccountsController:getSelectedAccount')
+        .address;
     const currentCustodyType = this.custodyController.getCustodyTypeByAddress(
       toChecksumHexAddress(currentAddress),
     );
@@ -761,7 +759,7 @@ export default class MMIController extends EventEmitter {
 
     // TEMP: Convert internal accounts to match identities format
     // TODO: Convert handleMmiPortfolio to use internal accounts
-    const internalAccounts = this.messenger
+    const internalAccounts = this.messagingSystem
       .call('AccountsController:listAccounts')
       .map((internalAccount: InternalAccount) => {
         return {
@@ -774,9 +772,10 @@ export default class MMIController extends EventEmitter {
       this.custodyController.getAccountDetails(address);
     const extensionId = this.extension.runtime.id;
 
-    const networks = Object.values(
-      this.networkController.state.networkConfigurationsByChainId,
+    const { networkConfigurationsByChainId } = this.messagingSystem.call(
+      'NetworkController:getState',
     );
+    const networks = Object.values(networkConfigurationsByChainId);
 
     return handleMmiPortfolio({
       keyringAccounts,
@@ -848,30 +847,38 @@ export default class MMIController extends EventEmitter {
   async setAccountAndNetwork(origin: string, address: string, chainId: number) {
     await this.appStateController.getUnlockPromise(true);
     const addressToLowerCase = address.toLowerCase();
-    const { address: selectedAddress } = this.messenger.call(
+    const { address: selectedAddress } = this.messagingSystem.call(
       'AccountsController:getSelectedAccount',
     );
 
     if (selectedAddress.toLowerCase() !== addressToLowerCase) {
-      const internalAccount = this.messenger.call(
+      const internalAccount = this.messagingSystem.call(
         'AccountsController:getAccountByAddress',
         addressToLowerCase,
       );
-      this.messenger.call(
-        'AccountsController:setSelectedAccount',
-        internalAccount.id,
-      );
+      if (internalAccount) {
+        this.messagingSystem.call(
+          'AccountsController:setSelectedAccount',
+          internalAccount.id,
+        );
+      }
     }
 
-    const selectedChainId = getCurrentChainId({
-      metamask: this.networkController.state,
-    });
+    const { selectedNetworkClientId } = this.messagingSystem.call(
+      'NetworkController:getState',
+    );
+    const {
+      configuration: { chainId: selectedChainId },
+    } = this.messagingSystem.call(
+      'NetworkController:getNetworkClientById',
+      selectedNetworkClientId,
+    );
 
     if (selectedChainId !== toHex(chainId)) {
-      const networkConfiguration =
-        this.networkController.state.networkConfigurationsByChainId[
-          toHex(chainId)
-        ];
+      const networkConfiguration = this.messagingSystem.call(
+        'NetworkController:getNetworkConfigurationByChainId',
+        toHex(chainId),
+      );
 
       const { networkClientId } =
         networkConfiguration?.rpcEndpoints?.[
@@ -879,7 +886,10 @@ export default class MMIController extends EventEmitter {
         ] ?? {};
 
       if (networkClientId) {
-        await this.networkController.setActiveNetwork(networkClientId);
+        await this.messagingSystem.call(
+          'NetworkController:setActiveNetwork',
+          networkClientId,
+        );
       }
     }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 89d91f134ae2..b11ffac6d2a8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -282,7 +282,7 @@ import {
   checkForMultipleVersionsRunning,
 } from './detect-multiple-instances';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-import MMIController from './controllers/mmi-controller';
+import { MMIController } from './controllers/mmi-controller';
 import { mmiKeyringBuilderFactory } from './mmi-keyring-builder-factory';
 ///: END:ONLY_INCLUDE_IF
 import ComposableObservableStore from './lib/ComposableObservableStore';
@@ -2026,6 +2026,8 @@ export default class MetamaskController extends EventEmitter {
         'AccountsController:listAccounts',
         'AccountsController:getSelectedAccount',
         'AccountsController:setSelectedAccount',
+        'NetworkController:getState',
+        'NetworkController:setActiveNetwork',
       ],
     });
 
@@ -2033,7 +2035,6 @@ export default class MetamaskController extends EventEmitter {
       messenger: mmiControllerMessenger,
       mmiConfigurationController: this.mmiConfigurationController,
       keyringController: this.keyringController,
-      preferencesController: this.preferencesController,
       appStateController: this.appStateController,
       transactionUpdateController: this.transactionUpdateController,
       custodyController: this.custodyController,
@@ -2041,7 +2042,6 @@ export default class MetamaskController extends EventEmitter {
       getPendingNonce: this.getPendingNonce.bind(this),
       accountTrackerController: this.accountTrackerController,
       metaMetricsController: this.metaMetricsController,
-      networkController: this.networkController,
       permissionController: this.permissionController,
       signatureController: this.signatureController,
       platform: this.platform,
diff --git a/shared/constants/mmi-controller.ts b/shared/constants/mmi-controller.ts
index 67be9f72cee6..83998fe6e7b9 100644
--- a/shared/constants/mmi-controller.ts
+++ b/shared/constants/mmi-controller.ts
@@ -3,10 +3,20 @@ import { TransactionMeta } from '@metamask/transaction-controller';
 import { TransactionUpdateController } from '@metamask-institutional/transaction-update';
 import { CustodyController } from '@metamask-institutional/custody-controller';
 import { SignatureController } from '@metamask/signature-controller';
-import { NetworkController } from '@metamask/network-controller';
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import { PreferencesController } from '../../app/scripts/controllers/preferences-controller';
+import {
+  NetworkController,
+  NetworkControllerGetNetworkClientByIdAction,
+  NetworkControllerGetStateAction,
+  NetworkControllerSetActiveNetworkAction,
+} from '@metamask/network-controller';
+import {
+  AccountsControllerGetAccountByAddressAction,
+  AccountsControllerSetAccountNameAction,
+  AccountsControllerListAccountsAction,
+  AccountsControllerGetSelectedAccountAction,
+  AccountsControllerSetSelectedAccountAction,
+} from '@metamask/accounts-controller';
+import { RestrictedControllerMessenger } from '@metamask/base-controller';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { AppStateController } from '../../app/scripts/controllers/app-state-controller';
@@ -17,18 +27,48 @@ import AccountTrackerController from '../../app/scripts/controllers/account-trac
 // eslint-disable-next-line import/no-restricted-paths
 import MetaMetricsController from '../../app/scripts/controllers/metametrics';
 
+// Unique name for the controller
+const controllerName = 'MMIController';
+
+type NetworkControllerGetNetworkConfigurationByChainId = {
+  type: `NetworkController:getNetworkConfigurationByChainId`;
+  handler: NetworkController['getNetworkConfigurationByChainId'];
+};
+
+/**
+ * Actions that this controller is allowed to call.
+ */
+export type AllowedActions =
+  | AccountsControllerGetAccountByAddressAction
+  | AccountsControllerSetAccountNameAction
+  | AccountsControllerListAccountsAction
+  | AccountsControllerGetSelectedAccountAction
+  | AccountsControllerSetSelectedAccountAction
+  | NetworkControllerGetStateAction
+  | NetworkControllerSetActiveNetworkAction
+  | NetworkControllerGetNetworkClientByIdAction
+  | NetworkControllerGetNetworkConfigurationByChainId;
+
+/**
+ * Messenger type for the {@link MMIController}.
+ */
+export type MMIControllerMessenger = RestrictedControllerMessenger<
+  typeof controllerName,
+  AllowedActions,
+  never,
+  AllowedActions['type'],
+  never
+>;
+
 export type MMIControllerOptions = {
   mmiConfigurationController: MmiConfigurationController;
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   keyringController: any;
-  preferencesController: PreferencesController;
   appStateController: AppStateController;
   transactionUpdateController: TransactionUpdateController;
   custodyController: CustodyController;
-  // TODO: Replace `any` with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  messenger: any;
+  messenger: MMIControllerMessenger;
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getState: () => any;

From afa736569ce1bfbd5292dc28b9694ae13c7d8941 Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Thu, 7 Nov 2024 17:06:24 +0100
Subject: [PATCH 051/111] fix: disable account syncing (#28359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR disables account syncing.
The QA team found a critical bug that prevents us from being confident
enough to release this feature now. We'll continue investigating and
we'll re-enable when we're 100% confident about this.

## **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/28359?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. No testing steps. Account syncing 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] -->

## **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.
---
 app/scripts/metamask-controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b11ffac6d2a8..caac30573406 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -156,6 +156,7 @@ import {
   NotificationServicesPushController,
   NotificationServicesController,
 } from '@metamask/notification-services-controller';
+import { isProduction } from '../../shared/modules/environment';
 import {
   methodsRequiringNetworkSwitch,
   methodsThatCanSwitchNetworkWithoutApproval,
@@ -1572,7 +1573,7 @@ export default class MetamaskController extends EventEmitter {
         },
       },
       env: {
-        isAccountSyncingEnabled: isManifestV3,
+        isAccountSyncingEnabled: !isProduction() && isManifestV3,
       },
       messenger: this.controllerMessenger.getRestricted({
         name: 'UserStorageController',

From 1614632ab7bd8a73ed7e6e9c1e44ef26e00583b1 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 7 Nov 2024 11:01:21 -0600
Subject: [PATCH 052/111] fix: Revert "fix: Negate privacy mode in Send screen"
 (#28360)

Reverts MetaMask/metamask-extension#28248

Need to revert this before
https://github.com/MetaMask/metamask-extension/pull/28021
---
 ui/components/app/currency-input/currency-input.js            | 1 -
 .../user-preferenced-currency-display.component.d.ts          | 1 -
 .../user-preferenced-currency-display.component.js            | 3 ---
 .../asset-picker-amount/asset-balance/asset-balance-text.tsx  | 3 ---
 .../ui/currency-display/currency-display.component.d.ts       | 1 -
 .../ui/currency-display/currency-display.component.js         | 4 +---
 ui/pages/asset/components/asset-page.tsx                      | 3 ---
 7 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index da69f3cbbe70..43da00ad3ab0 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -222,7 +222,6 @@ export default function CurrencyInput({
         suffix={suffix}
         className="currency-input__conversion-component"
         displayValue={displayValue}
-        privacyModeExempt
       />
     );
   };
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 ba465f1c5f08..4db61d568f4a 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
@@ -16,7 +16,6 @@ export type UserPrefrencedCurrencyDisplayProps = OverridingUnion<
     showCurrencySuffix?: boolean;
     shouldCheckShowNativeToken?: boolean;
     isAggregatedFiatOverviewBalance?: boolean;
-    privacyModeExempt?: boolean;
   }
 >;
 
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
index 77157e4b5c95..613b731d0a16 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
@@ -28,7 +28,6 @@ export default function UserPreferencedCurrencyDisplay({
   showNative,
   showCurrencySuffix,
   shouldCheckShowNativeToken,
-  privacyModeExempt,
   ...restProps
 }) {
   // NOTE: When displaying currencies, we need the actual account to detect whether we're in a
@@ -84,7 +83,6 @@ export default function UserPreferencedCurrencyDisplay({
       numberOfDecimals={numberOfDecimals}
       prefixComponent={prefixComponent}
       suffix={showCurrencySuffix && !showEthLogo && currency}
-      privacyModeExempt={privacyModeExempt}
     />
   );
 }
@@ -128,7 +126,6 @@ const UserPreferencedCurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   shouldCheckShowNativeToken: PropTypes.bool,
-  privacyModeExempt: PropTypes.bool,
 };
 
 UserPreferencedCurrencyDisplay.propTypes =
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 fbf608deedd8..67def7ee82b1 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
@@ -105,7 +105,6 @@ export function AssetBalanceText({
         currency={secondaryCurrency}
         numberOfDecimals={2}
         displayValue={`${formattedFiat}${errorText}`}
-        privacyModeExempt
       />
     );
   }
@@ -117,7 +116,6 @@ export function AssetBalanceText({
           {...commonProps}
           value={asset.balance}
           type={PRIMARY}
-          privacyModeExempt
         />
         {errorText ? (
           <Text
@@ -138,7 +136,6 @@ export function AssetBalanceText({
       <UserPreferencedCurrencyDisplay
         {...commonProps}
         displayValue={`${balanceString || ''}${errorText}`}
-        privacyModeExempt
       />
     );
   }
diff --git a/ui/components/ui/currency-display/currency-display.component.d.ts b/ui/components/ui/currency-display/currency-display.component.d.ts
index fd642cd4e6cd..d8e1d6b60e1e 100644
--- a/ui/components/ui/currency-display/currency-display.component.d.ts
+++ b/ui/components/ui/currency-display/currency-display.component.d.ts
@@ -25,7 +25,6 @@ export type CurrencyDisplayProps = OverridingUnion<
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     suffixProps?: Record<string, any>;
-    privacyModeExempt?: boolean;
   }
 >;
 
diff --git a/ui/components/ui/currency-display/currency-display.component.js b/ui/components/ui/currency-display/currency-display.component.js
index a1b413dd6a7f..a0bb114409f6 100644
--- a/ui/components/ui/currency-display/currency-display.component.js
+++ b/ui/components/ui/currency-display/currency-display.component.js
@@ -35,7 +35,6 @@ export default function CurrencyDisplay({
   textProps = {},
   suffixProps = {},
   isAggregatedFiatOverviewBalance = false,
-  privacyModeExempt,
   ...props
 }) {
   const { privacyMode } = useSelector(getPreferences);
@@ -77,7 +76,7 @@ export default function CurrencyDisplay({
         className="currency-display-component__text"
         ellipsis
         variant={TextVariant.inherit}
-        isHidden={!privacyModeExempt && privacyMode}
+        isHidden={privacyMode}
         data-testid="account-value-and-suffix"
         {...textProps}
       >
@@ -126,7 +125,6 @@ const CurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   isAggregatedFiatOverviewBalance: PropTypes.bool,
-  privacyModeExempt: PropTypes.bool,
 };
 
 CurrencyDisplay.propTypes = CurrencyDisplayPropTypes;
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 4fb294b17294..c70b60169edb 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -8,7 +8,6 @@ import {
   getCurrentCurrency,
   getIsBridgeChain,
   getIsSwapsChain,
-  getPreferences,
   getSelectedInternalAccount,
   getSwapsDefaultToken,
   getTokensMarketData,
@@ -103,7 +102,6 @@ const AssetPage = ({
   const conversionRate = useSelector(getConversionRate);
   const allMarketData = useSelector(getTokensMarketData);
   const isBridgeChain = useSelector(getIsBridgeChain);
-  const { privacyMode } = useSelector(getPreferences);
   const isBuyableChain = useSelector(getIsNativeTokenBuyable);
   const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
   const account = useSelector(getSelectedInternalAccount, isEqual);
@@ -198,7 +196,6 @@ const AssetPage = ({
             tokenImage={image}
             isOriginalTokenSymbol={asset.isOriginalNativeSymbol}
             isNativeCurrency={true}
-            privacyMode={privacyMode}
           />
         ) : (
           <TokenCell

From fce0fe41516ab386c161ef8fb7e07d5363dc3cbc Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Thu, 7 Nov 2024 11:29:03 -0600
Subject: [PATCH 053/111] fix: bump `@metamask/queued-request-controller` with
 patch fix (#28355)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Bumps version of QueuedRequestController, with a patch that fixes an
issue where `QueuedRequestController.state.queuedRequestCount` is not
updated after flushing requests for an origin

## References
- https://github.com/MetaMask/core/pull/4899
- https://github.com/MetaMask/core/pull/4846
- https://github.com/MetaMask/metamask-extension/pull/28090

## Fixes
Fixes #28358

[Slack discussion in v12.7.0 RC
Thread](https://consensys.slack.com/archives/C029JG63136/p1730918073046389?thread_ts=1729246801.516029&cid=C029JG63136)

## Before


https://drive.google.com/file/d/1ujdQgVLlT8KlwRwO-Cc3XvRHPrkpxIg_/view?usp=drive_link

## After


https://github.com/user-attachments/assets/e77928e5-165b-441a-b4da-0e10471c0529


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

## **Manual testing steps**

On a dapp permissioned for chain A and B, on chain A, queue up one send
transaction, then use wallet_switchEthereumChain to switch to chain B,
then queue up several more send transactions. Reject/approve the first
transaction. Afterwards, you should see chain B as the active chain for
the dapp, and all subsequent approvals cleared/rejected automatically.


- [ ] 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.
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index b570cc6f9245..2fd832a3ce71 100644
--- a/package.json
+++ b/package.json
@@ -333,7 +333,7 @@
     "@metamask/preinstalled-example-snap": "^0.2.0",
     "@metamask/profile-sync-controller": "^0.9.7",
     "@metamask/providers": "^14.0.2",
-    "@metamask/queued-request-controller": "^7.0.0",
+    "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.0",
     "@metamask/rpc-errors": "^7.0.0",
     "@metamask/safe-event-emitter": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index aa975513b90a..f22f36057099 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6069,12 +6069,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/queued-request-controller@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@metamask/queued-request-controller@npm:7.0.0"
+"@metamask/queued-request-controller@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "@metamask/queued-request-controller@npm:7.0.1"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.1"
+    "@metamask/controller-utils": "npm:^11.4.2"
     "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
@@ -6082,7 +6082,7 @@ __metadata:
   peerDependencies:
     "@metamask/network-controller": ^22.0.0
     "@metamask/selected-network-controller": ^19.0.0
-  checksum: 10/69118c11e3faecdbec7c9f02f4ecec4734ce0950115bfac0cdd4338309898690ae3187bcef1cc4f75f54c5c02eff07d80286d3ef29088a665039c13cb50bef88
+  checksum: 10/e5b16b3dc2fa0dcf74a81b5046abb65bc05da3802ee891b5a59a80b980301c790cf949d72adba00ead6f5b3d2eaac40694308297f7dc08eb5e5f05b5a68bbf57
   languageName: node
   linkType: hard
 
@@ -26565,7 +26565,7 @@ __metadata:
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
     "@metamask/profile-sync-controller": "npm:^0.9.7"
     "@metamask/providers": "npm:^14.0.2"
-    "@metamask/queued-request-controller": "npm:^7.0.0"
+    "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.0"
     "@metamask/rpc-errors": "npm:^7.0.0"
     "@metamask/safe-event-emitter": "npm:^3.1.1"

From 2484e864219220a5088e831b41c0144c8a717f10 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:57:17 -0500
Subject: [PATCH 054/111] perf: ensure `setupLocale` doesn't fetch
 `_locales/en/messages.json` twice (#26553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We always load the english version of `messages.json`, but we also
always load the user's locale's `messages.json`. These can be the same
thing but our locale loader didn't take that into consideration. This PR
updates the function to only load the user's local if it differs from
our default locale, otherwise it just uses the same `messages.json`
between the two.

Our locale function has a side effect: it loads locale-related
Internationalization features as well. So this PR also updates those
side-effects in a similar manner to avoid doing the work twice.

<!--
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/26553?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

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

## **Screenshots/Recordings**


### **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.
-->
---
 shared/lib/error-utils.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/shared/lib/error-utils.js b/shared/lib/error-utils.js
index 89caef28026d..66efd6fb61fb 100644
--- a/shared/lib/error-utils.js
+++ b/shared/lib/error-utils.js
@@ -5,17 +5,27 @@ import getFirstPreferredLangCode from '../../app/scripts/lib/get-first-preferred
 import { fetchLocale, loadRelativeTimeFormatLocaleData } from '../modules/i18n';
 import switchDirection from './switch-direction';
 
+const defaultLocale = 'en';
 const _setupLocale = async (currentLocale) => {
-  const currentLocaleMessages = currentLocale
-    ? await fetchLocale(currentLocale)
-    : {};
-  const enLocaleMessages = await fetchLocale('en');
+  const enRelativeTime = loadRelativeTimeFormatLocaleData(defaultLocale);
+  const enLocale = fetchLocale(defaultLocale);
 
-  await loadRelativeTimeFormatLocaleData('en');
-  if (currentLocale) {
-    await loadRelativeTimeFormatLocaleData(currentLocale);
+  const promises = [enRelativeTime, enLocale];
+  if (currentLocale === defaultLocale) {
+    // enLocaleMessages and currentLocaleMessages are the same; reuse enLocale
+    promises.push(enLocale); // currentLocaleMessages
+  } else if (currentLocale) {
+    // currentLocale does not match enLocaleMessages
+    promises.push(fetchLocale(currentLocale)); // currentLocaleMessages
+    promises.push(loadRelativeTimeFormatLocaleData(currentLocale));
+  } else {
+    // currentLocale is not set
+    promises.push(Promise.resolve({})); // currentLocaleMessages
   }
 
+  const [, enLocaleMessages, currentLocaleMessages] = await Promise.all(
+    promises,
+  );
   return { currentLocaleMessages, enLocaleMessages };
 };
 

From 54c563ec980699cb28af5df143de6fa4cacd2b7e Mon Sep 17 00:00:00 2001
From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com>
Date: Thu, 7 Nov 2024 22:19:14 +0400
Subject: [PATCH 055/111] fix: mv2 firefox csp header (#27770)
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/27770?quickstart=1)

This PR implements a workaround for a long-standing Firefox MV2 bug
where the content-security-policy header is not bypassed, triggering an
error.

The solution is simple: we check if the extension is MV2 running in
Firefox. If yes, we override the header to prevent the error from
raising.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/3133,
https://github.com/MetaMask/MetaMask-planning/issues/3342

## **Manual testing steps**

1. Opening github.com should not trigger the CSP error

## **Screenshots/Recordings**

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

### **Before**

<img width="726" alt="csp-toggle-off"
src="https://github.com/user-attachments/assets/3877e37a-c205-4717-af6f-92e7f63a15a4">

<img width="1725" alt="reprod"
src="https://github.com/user-attachments/assets/c923bedb-f73f-472c-8e0c-3545876a0bc3">

### **After**

<img width="719" alt="csp-toggle-on"
src="https://github.com/user-attachments/assets/8e763391-1bac-4ff0-9d07-63436d7ee41d">

<img width="1723" alt="fixed"
src="https://github.com/user-attachments/assets/1ca7c4e7-7c0e-4e75-8f0c-586ce99e4000">

## **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: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
---
 app/_locales/en/messages.json                 |  6 ++
 app/scripts/background.js                     | 41 ++++++++
 app/scripts/constants/sentry-state.ts         |  1 +
 .../preferences-controller.test.ts            | 17 ++++
 .../controllers/preferences-controller.ts     | 20 ++++
 app/scripts/lib/backup.test.js                |  1 +
 app/scripts/metamask-controller.js            |  4 +
 development/build/utils.js                    |  2 +-
 development/create-static-server.js           | 13 ++-
 development/static-server.js                  |  2 +-
 .../test/plugins.SelfInjectPlugin.test.ts     |  4 +-
 .../utils/plugins/SelfInjectPlugin/index.ts   | 21 +++-
 .../utils/plugins/SelfInjectPlugin/types.ts   | 15 ++-
 package.json                                  |  1 +
 shared/modules/add-nonce-to-csp.test.ts       | 98 +++++++++++++++++++
 shared/modules/add-nonce-to-csp.ts            | 38 +++++++
 shared/modules/provider-injection.js          | 94 +++++++++++-------
 shared/modules/provider-injection.test.ts     |  6 +-
 test/e2e/default-fixture.js                   |  1 +
 test/e2e/fixture-builder.js                   |  1 +
 test/e2e/helpers.js                           |  5 +-
 test/e2e/phishing-warning-page-server.js      |  2 +-
 .../index.html                                |  9 ++
 .../content-security-policy.spec.ts           | 46 +++++++++
 ...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 |  1 +
 .../errors-before-init-opt-in-ui-state.json   |  1 +
 .../synchronous-injection.spec.js             |  2 +-
 ui/helpers/constants/settings.js              | 15 +++
 ui/helpers/utils/settings-search.js           |  6 +-
 ui/helpers/utils/settings-search.test.js      |  9 +-
 .../advanced-tab/advanced-tab.component.js    | 45 +++++++++
 .../advanced-tab/advanced-tab.container.js    |  6 ++
 .../advanced-tab/advanced-tab.stories.js      | 18 ++++
 ui/store/actions.ts                           | 12 +++
 yarn.lock                                     | 10 ++
 37 files changed, 515 insertions(+), 60 deletions(-)
 create mode 100644 shared/modules/add-nonce-to-csp.test.ts
 create mode 100644 shared/modules/add-nonce-to-csp.ts
 create mode 100644 test/e2e/tests/content-security-policy/content-security-policy-mock-page/index.html
 create mode 100644 test/e2e/tests/content-security-policy/content-security-policy.spec.ts

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 62dda6c29ef0..202dc04c2fa8 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3789,6 +3789,12 @@
   "outdatedBrowserNotification": {
     "message": "Your browser is out of date. If you don't update your browser, you won't be able to get security patches and new features from MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Override Content-Security-Policy header"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "This option is a workaround for a known issue in Firefox, where a dapp's Content-Security-Policy header may prevent the extension from loading properly. Disabling this option is not recommended unless required for specific web page compatibility."
+  },
   "padlock": {
     "message": "Padlock"
   },
diff --git a/app/scripts/background.js b/app/scripts/background.js
index bacb6adddf9f..90a52b6c0d19 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -56,6 +56,8 @@ import {
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { getCurrentChainId } from '../../ui/selectors';
+import { addNonceToCsp } from '../../shared/modules/add-nonce-to-csp';
+import { checkURLForProviderInjection } from '../../shared/modules/provider-injection';
 import migrations from './migrations';
 import Migrator from './lib/migrator';
 import ExtensionPlatform from './platforms/extension';
@@ -333,6 +335,40 @@ function maybeDetectPhishing(theController) {
   );
 }
 
+/**
+ * Overrides the Content-Security-Policy (CSP) header by adding a nonce to the `script-src` directive.
+ * This is a workaround for [Bug #1446231](https://bugzilla.mozilla.org/show_bug.cgi?id=1446231),
+ * which involves overriding the page CSP for inline script nodes injected by extension content scripts.
+ */
+function overrideContentSecurityPolicyHeader() {
+  // The extension url is unique per install on Firefox, so we can safely add it as a nonce to the CSP header
+  const nonce = btoa(browser.runtime.getURL('/'));
+  browser.webRequest.onHeadersReceived.addListener(
+    ({ responseHeaders, url }) => {
+      // Check whether inpage.js is going to be injected into the page or not.
+      // There is no reason to modify the headers if we are not injecting inpage.js.
+      const isInjected = checkURLForProviderInjection(new URL(url));
+
+      // Check if the user has enabled the overrideContentSecurityPolicyHeader preference
+      const isEnabled =
+        controller.preferencesController.state
+          .overrideContentSecurityPolicyHeader;
+
+      if (isInjected && isEnabled) {
+        for (const header of responseHeaders) {
+          if (header.name.toLowerCase() === 'content-security-policy') {
+            header.value = addNonceToCsp(header.value, nonce);
+          }
+        }
+      }
+
+      return { responseHeaders };
+    },
+    { types: ['main_frame', 'sub_frame'], urls: ['http://*/*', 'https://*/*'] },
+    ['blocking', 'responseHeaders'],
+  );
+}
+
 // These are set after initialization
 let connectRemote;
 let connectExternalExtension;
@@ -479,6 +515,11 @@ async function initialize() {
 
     if (!isManifestV3) {
       await loadPhishingWarningPage();
+      // Workaround for Bug #1446231 to override page CSP for inline script nodes injected by extension content scripts
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1446231
+      if (getPlatform() === PLATFORM_FIREFOX) {
+        overrideContentSecurityPolicyHeader();
+      }
     }
     await sendReadyMessageToTabs();
     log.info('MetaMask initialization complete.');
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 3125016ea0b5..655851590441 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -223,6 +223,7 @@ export const SENTRY_BACKGROUND_STATE = {
     advancedGasFee: true,
     currentLocale: true,
     dismissSeedBackUpReminder: true,
+    overrideContentSecurityPolicyHeader: true,
     featureFlags: true,
     forgottenPassword: true,
     identities: false,
diff --git a/app/scripts/controllers/preferences-controller.test.ts b/app/scripts/controllers/preferences-controller.test.ts
index 25010cdd3a0f..39a2d49648b2 100644
--- a/app/scripts/controllers/preferences-controller.test.ts
+++ b/app/scripts/controllers/preferences-controller.test.ts
@@ -837,6 +837,23 @@ describe('preferences controller', () => {
     });
   });
 
+  describe('overrideContentSecurityPolicyHeader', () => {
+    it('defaults overrideContentSecurityPolicyHeader to true', () => {
+      const { controller } = setupController({});
+      expect(
+        controller.state.overrideContentSecurityPolicyHeader,
+      ).toStrictEqual(true);
+    });
+
+    it('set overrideContentSecurityPolicyHeader to false', () => {
+      const { controller } = setupController({});
+      controller.setOverrideContentSecurityPolicyHeader(false);
+      expect(
+        controller.state.overrideContentSecurityPolicyHeader,
+      ).toStrictEqual(false);
+    });
+  });
+
   describe('snapsAddSnapAccountModalDismissed', () => {
     it('defaults snapsAddSnapAccountModalDismissed to false', () => {
       const { controller } = setupController({});
diff --git a/app/scripts/controllers/preferences-controller.ts b/app/scripts/controllers/preferences-controller.ts
index b4ce3ca71e64..dce2ef3d0512 100644
--- a/app/scripts/controllers/preferences-controller.ts
+++ b/app/scripts/controllers/preferences-controller.ts
@@ -133,6 +133,7 @@ export type PreferencesControllerState = Omit<
   useNonceField: boolean;
   usePhishDetect: boolean;
   dismissSeedBackUpReminder: boolean;
+  overrideContentSecurityPolicyHeader: boolean;
   useMultiAccountBalanceChecker: boolean;
   useSafeChainsListValidation: boolean;
   use4ByteResolution: boolean;
@@ -175,6 +176,7 @@ export const getDefaultPreferencesControllerState =
     useNonceField: false,
     usePhishDetect: true,
     dismissSeedBackUpReminder: false,
+    overrideContentSecurityPolicyHeader: true,
     useMultiAccountBalanceChecker: true,
     useSafeChainsListValidation: true,
     // set to true means the dynamic list from the API is being used
@@ -306,6 +308,10 @@ const controllerMetadata = {
     persist: true,
     anonymous: true,
   },
+  overrideContentSecurityPolicyHeader: {
+    persist: true,
+    anonymous: true,
+  },
   useMultiAccountBalanceChecker: {
     persist: true,
     anonymous: true,
@@ -1009,6 +1015,20 @@ export class PreferencesController extends BaseController<
     });
   }
 
+  /**
+   * A setter for the user preference to override the Content-Security-Policy header
+   *
+   * @param overrideContentSecurityPolicyHeader - User preference for overriding the Content-Security-Policy header.
+   */
+  setOverrideContentSecurityPolicyHeader(
+    overrideContentSecurityPolicyHeader: boolean,
+  ): void {
+    this.update((state) => {
+      state.overrideContentSecurityPolicyHeader =
+        overrideContentSecurityPolicyHeader;
+    });
+  }
+
   /**
    * A setter for the incomingTransactions in preference to be updated
    *
diff --git a/app/scripts/lib/backup.test.js b/app/scripts/lib/backup.test.js
index b3a7f176c2e6..826aa04018d9 100644
--- a/app/scripts/lib/backup.test.js
+++ b/app/scripts/lib/backup.test.js
@@ -150,6 +150,7 @@ const jsonData = JSON.stringify({
     useNonceField: false,
     usePhishDetect: true,
     dismissSeedBackUpReminder: false,
+    overrideContentSecurityPolicyHeader: true,
     useTokenDetection: false,
     useCollectibleDetection: false,
     openSeaEnabled: false,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index caac30573406..d43c12ff24a1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3487,6 +3487,10 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setDismissSeedBackUpReminder.bind(
           preferencesController,
         ),
+      setOverrideContentSecurityPolicyHeader:
+        preferencesController.setOverrideContentSecurityPolicyHeader.bind(
+          preferencesController,
+        ),
       setAdvancedGasFee: preferencesController.setAdvancedGasFee.bind(
         preferencesController,
       ),
diff --git a/development/build/utils.js b/development/build/utils.js
index 525815d2520a..626aacd588c7 100644
--- a/development/build/utils.js
+++ b/development/build/utils.js
@@ -293,7 +293,7 @@ function getBuildName({
 function makeSelfInjecting(filePath) {
   const fileContents = readFileSync(filePath, 'utf8');
   const textContent = JSON.stringify(fileContents);
-  const js = `{let d=document,s=d.createElement('script');s.textContent=${textContent};d.documentElement.appendChild(s).remove();}`;
+  const js = `{let d=document,s=d.createElement('script');s.textContent=${textContent};s.nonce=btoa((globalThis.browser||chrome).runtime.getURL('/'));d.documentElement.appendChild(s).remove();}`;
   writeFileSync(filePath, js, 'utf8');
 }
 
diff --git a/development/create-static-server.js b/development/create-static-server.js
index a8d5e28b0088..8e55fa54ca13 100755
--- a/development/create-static-server.js
+++ b/development/create-static-server.js
@@ -4,10 +4,17 @@ const path = require('path');
 
 const serveHandler = require('serve-handler');
 
-const createStaticServer = (rootDirectory) => {
+/**
+ * Creates an HTTP server that serves static files from a directory using serve-handler.
+ * If a request URL starts with `/node_modules/`, it rewrites the URL and serves files from the `node_modules` directory.
+ *
+ * @param { NonNullable<Parameters<typeof import("serve-handler")>[2]> } options - Configuration options for serve-handler. Documentation can be found here: https://github.com/vercel/serve-handler
+ * @returns {http.Server} An instance of an HTTP server configured with the specified options.
+ */
+const createStaticServer = (options) => {
   return http.createServer((request, response) => {
     if (request.url.startsWith('/node_modules/')) {
-      request.url = request.url.substr(14);
+      request.url = request.url.slice(14);
       return serveHandler(request, response, {
         directoryListing: false,
         public: path.resolve('./node_modules'),
@@ -15,7 +22,7 @@ const createStaticServer = (rootDirectory) => {
     }
     return serveHandler(request, response, {
       directoryListing: false,
-      public: rootDirectory,
+      ...options,
     });
   });
 };
diff --git a/development/static-server.js b/development/static-server.js
index bb15133d6fdd..ec3a51a512f0 100755
--- a/development/static-server.js
+++ b/development/static-server.js
@@ -31,7 +31,7 @@ const onRequest = (request, response) => {
 };
 
 const startServer = ({ port, rootDirectory }) => {
-  const server = createStaticServer(rootDirectory);
+  const server = createStaticServer({ public: rootDirectory });
 
   server.on('request', onRequest);
 
diff --git a/development/webpack/test/plugins.SelfInjectPlugin.test.ts b/development/webpack/test/plugins.SelfInjectPlugin.test.ts
index 3a3ef729eacf..b6390654a4bb 100644
--- a/development/webpack/test/plugins.SelfInjectPlugin.test.ts
+++ b/development/webpack/test/plugins.SelfInjectPlugin.test.ts
@@ -55,7 +55,7 @@ describe('SelfInjectPlugin', () => {
           // reference the `sourceMappingURL`
           assert.strictEqual(
             newSource,
-            `{let d=document,s=d.createElement('script');s.textContent="${source}\\n//# sourceMappingURL=${filename}.map"+\`\\n//# sourceURL=\${(globalThis.browser||chrome).runtime.getURL("${filename}")};\`;d.documentElement.appendChild(s).remove()}`,
+            `{let d=document,s=d.createElement('script');s.textContent="${source}\\n//# sourceMappingURL=${filename}.map"+\`\\n//# sourceURL=\${(globalThis.browser||chrome).runtime.getURL("${filename}")};\`;s.nonce=btoa((globalThis.browser||chrome).runtime.getURL("/"));d.documentElement.appendChild(s).remove()}`,
           );
         } else {
           // the new source should NOT reference the new sourcemap, since it's
@@ -66,7 +66,7 @@ describe('SelfInjectPlugin', () => {
           // console.
           assert.strictEqual(
             newSource,
-            `{let d=document,s=d.createElement('script');s.textContent="console.log(3);"+\`\\n//# sourceURL=\${(globalThis.browser||chrome).runtime.getURL("${filename}")};\`;d.documentElement.appendChild(s).remove()}`,
+            `{let d=document,s=d.createElement('script');s.textContent="console.log(3);"+\`\\n//# sourceURL=\${(globalThis.browser||chrome).runtime.getURL("${filename}")};\`;s.nonce=btoa((globalThis.browser||chrome).runtime.getURL("/"));d.documentElement.appendChild(s).remove()}`,
           );
         }
 
diff --git a/development/webpack/utils/plugins/SelfInjectPlugin/index.ts b/development/webpack/utils/plugins/SelfInjectPlugin/index.ts
index b80f6102ab75..18d3624310ae 100644
--- a/development/webpack/utils/plugins/SelfInjectPlugin/index.ts
+++ b/development/webpack/utils/plugins/SelfInjectPlugin/index.ts
@@ -6,6 +6,19 @@ import type { SelfInjectPluginOptions, Source, Compiler } from './types';
 
 export { type SelfInjectPluginOptions } from './types';
 
+/**
+ * Generates a runtime URL expression for a given path.
+ *
+ * This function constructs a URL string using the `runtime.getURL` method
+ * from either the `globalThis.browser` or `chrome` object, depending on
+ * which one is available in the global scope.
+ *
+ * @param path - The path of the runtime URL.
+ * @returns The constructed runtime URL string.
+ */
+const getRuntimeURLExpression = (path: string) =>
+  `(globalThis.browser||chrome).runtime.getURL(${JSON.stringify(path)})`;
+
 /**
  * Default options for the SelfInjectPlugin.
  */
@@ -13,8 +26,11 @@ const defaultOptions = {
   // The default `sourceUrlExpression` is configured for browser extensions.
   // It generates the absolute url of the given file as an extension url.
   // e.g., `chrome-extension://<extension-id>/scripts/inpage.js`
-  sourceUrlExpression: (filename: string) =>
-    `(globalThis.browser||chrome).runtime.getURL(${JSON.stringify(filename)})`,
+  sourceUrlExpression: getRuntimeURLExpression,
+  // The default `nonceExpression` is configured for browser extensions.
+  // It generates the absolute url of a path as an extension url in base64.
+  // e.g., `Y2hyb21lLWV4dGVuc2lvbjovLzxleHRlbnNpb24taWQ+Lw==`
+  nonceExpression: (path: string) => `btoa(${getRuntimeURLExpression(path)})`,
 } satisfies SelfInjectPluginOptions;
 
 /**
@@ -142,6 +158,7 @@ export class SelfInjectPlugin {
       `\`\\n//# sourceURL=\${${this.options.sourceUrlExpression(file)}};\``,
     );
     newSource.add(`;`);
+    newSource.add(`s.nonce=${this.options.nonceExpression('/')};`);
     // add and immediately remove the script to avoid modifying the DOM.
     newSource.add(`d.documentElement.appendChild(s).remove()`);
     newSource.add(`}`);
diff --git a/development/webpack/utils/plugins/SelfInjectPlugin/types.ts b/development/webpack/utils/plugins/SelfInjectPlugin/types.ts
index 2240227bd76a..e70467cd270b 100644
--- a/development/webpack/utils/plugins/SelfInjectPlugin/types.ts
+++ b/development/webpack/utils/plugins/SelfInjectPlugin/types.ts
@@ -23,7 +23,7 @@ export type SelfInjectPluginOptions = {
    * will be injected into matched file to provide a sourceURL for the self
    * injected script.
    *
-   * Defaults to `(filename: string) => (globalThis.browser||globalThis.chrome).runtime.getURL("${filename}")`
+   * Defaults to `(filename: string) => (globalThis.browser||chrome).runtime.getURL("${filename}")`
    *
    * @example Custom
    * ```js
@@ -39,11 +39,22 @@ export type SelfInjectPluginOptions = {
    *
    * ```js
    * {
-   *   sourceUrlExpression: (filename) => `(globalThis.browser||globalThis.chrome).runtime.getURL("${filename}")`
+   *   sourceUrlExpression: (filename) => `(globalThis.browser||chrome).runtime.getURL("${filename}")`
    * }
    * ```
    * @param filename - the chunk's relative filename as it will exist in the output directory
    * @returns
    */
   sourceUrlExpression?: (filename: string) => string;
+  /**
+   * A function that returns a JavaScript expression escaped as a string which
+   * will be injected into matched file to set a nonce for the self
+   * injected script.
+   *
+   * Defaults to `(path: string) => btoa((globalThis.browser||chrome).runtime.getURL("${path}"))`
+   *
+   * @param path - the path to be encoded as a nonce
+   * @returns
+   */
+  nonceExpression?: (path: string) => string;
 };
diff --git a/package.json b/package.json
index 2fd832a3ce71..c612dd76fb20 100644
--- a/package.json
+++ b/package.json
@@ -528,6 +528,7 @@
     "@types/redux-mock-store": "1.0.6",
     "@types/remote-redux-devtools": "^0.5.5",
     "@types/selenium-webdriver": "^4.1.19",
+    "@types/serve-handler": "^6.1.4",
     "@types/sinon": "^10.0.13",
     "@types/sprintf-js": "^1",
     "@types/w3c-web-hid": "^1.0.3",
diff --git a/shared/modules/add-nonce-to-csp.test.ts b/shared/modules/add-nonce-to-csp.test.ts
new file mode 100644
index 000000000000..dc80bfd9a92a
--- /dev/null
+++ b/shared/modules/add-nonce-to-csp.test.ts
@@ -0,0 +1,98 @@
+import { addNonceToCsp } from './add-nonce-to-csp';
+
+describe('addNonceToCsp', () => {
+  it('empty string', () => {
+    const input = '';
+    const expected = '';
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('one empty directive', () => {
+    const input = 'script-src';
+    const expected = `script-src 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('one directive, one value', () => {
+    const input = 'script-src default.example';
+    const expected = `script-src default.example 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('one directive, two values', () => {
+    const input = "script-src 'self' default.example";
+    const expected = `script-src 'self' default.example 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('multiple directives', () => {
+    const input =
+      "default-src 'self'; script-src 'unsafe-eval' scripts.example; object-src; style-src styles.example";
+    const expected = `default-src 'self'; script-src 'unsafe-eval' scripts.example 'nonce-test'; object-src; style-src styles.example`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('no applicable directive', () => {
+    const input = 'img-src https://example.com';
+    const expected = `img-src https://example.com`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('non-ASCII directives', () => {
+    const input = 'script-src default.example;\u0080;style-src style.example';
+    const expected = `script-src default.example 'nonce-test';\u0080;style-src style.example`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('uppercase directive names', () => {
+    const input = 'SCRIPT-SRC DEFAULT.EXAMPLE';
+    const expected = `SCRIPT-SRC DEFAULT.EXAMPLE 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('duplicate directive names', () => {
+    const input =
+      'default-src default.example; script-src script.example; script-src script.example';
+    const expected = `default-src default.example; script-src script.example 'nonce-test'; script-src script.example`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('nonce value contains script-src', () => {
+    const input =
+      "default-src 'self' 'nonce-script-src'; script-src 'self' https://example.com";
+    const expected = `default-src 'self' 'nonce-script-src'; script-src 'self' https://example.com 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('url value contains script-src', () => {
+    const input =
+      "default-src 'self' https://script-src.com; script-src 'self' https://example.com";
+    const expected = `default-src 'self' https://script-src.com; script-src 'self' https://example.com 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('fallback to default-src', () => {
+    const input = `default-src 'none'`;
+    const expected = `default-src 'none' 'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+
+  it('keep ascii whitespace characters', () => {
+    const input = '       script-src        default.example      ';
+    const expected = `       script-src        default.example       'nonce-test'`;
+    const output = addNonceToCsp(input, 'test');
+    expect(output).toBe(expected);
+  });
+});
diff --git a/shared/modules/add-nonce-to-csp.ts b/shared/modules/add-nonce-to-csp.ts
new file mode 100644
index 000000000000..a8b7fe333089
--- /dev/null
+++ b/shared/modules/add-nonce-to-csp.ts
@@ -0,0 +1,38 @@
+// ASCII whitespace is U+0009 TAB, U+000A LF, U+000C FF, U+000D CR, or U+0020 SPACE.
+// See <https://infra.spec.whatwg.org/#ascii-whitespace>.
+const ASCII_WHITESPACE_CHARS = ['\t', '\n', '\f', '\r', ' '].join('');
+
+const matchDirective = (directive: string) =>
+  /* eslint-disable require-unicode-regexp */
+  new RegExp(
+    `^([${ASCII_WHITESPACE_CHARS}]*${directive}[${ASCII_WHITESPACE_CHARS}]*)`, // Match the directive and surrounding ASCII whitespace
+    'is', // Case-insensitive, including newlines
+  );
+const matchScript = matchDirective('script-src');
+const matchDefault = matchDirective('default-src');
+
+/**
+ * Adds a nonce to a Content Security Policy (CSP) string.
+ *
+ * @param text - The Content Security Policy (CSP) string to add the nonce to.
+ * @param nonce - The nonce to add to the Content Security Policy (CSP) string.
+ * @returns The updated Content Security Policy (CSP) string.
+ */
+export const addNonceToCsp = (text: string, nonce: string) => {
+  const formattedNonce = ` 'nonce-${nonce}'`;
+  const directives = text.split(';');
+  const scriptIndex = directives.findIndex((directive) =>
+    matchScript.test(directive),
+  );
+  if (scriptIndex >= 0) {
+    directives[scriptIndex] += formattedNonce;
+  } else {
+    const defaultIndex = directives.findIndex((directive) =>
+      matchDefault.test(directive),
+    );
+    if (defaultIndex >= 0) {
+      directives[defaultIndex] += formattedNonce;
+    }
+  }
+  return directives.join(';');
+};
diff --git a/shared/modules/provider-injection.js b/shared/modules/provider-injection.js
index 25a316e93440..b96df88c29e2 100644
--- a/shared/modules/provider-injection.js
+++ b/shared/modules/provider-injection.js
@@ -5,40 +5,36 @@
  */
 export default function shouldInjectProvider() {
   return (
-    doctypeCheck() &&
-    suffixCheck() &&
-    documentElementCheck() &&
-    !blockedDomainCheck()
+    checkURLForProviderInjection(new URL(window.location)) &&
+    checkDocumentForProviderInjection()
   );
 }
 
 /**
- * Checks the doctype of the current document if it exists
+ * Checks if a given URL is eligible for provider injection.
  *
- * @returns {boolean} {@code true} if the doctype is html or if none exists
+ * This function determines if a URL passes the suffix check and is not part of the blocked domains.
+ *
+ * @param {URL} url - The URL to be checked for injection.
+ * @returns {boolean} Returns `true` if the URL passes the suffix check and is not blocked, otherwise `false`.
  */
-function doctypeCheck() {
-  const { doctype } = window.document;
-  if (doctype) {
-    return doctype.name === 'html';
-  }
-  return true;
+export function checkURLForProviderInjection(url) {
+  return suffixCheck(url) && !blockedDomainCheck(url);
 }
 
 /**
- * Returns whether or not the extension (suffix) of the current document is prohibited
+ * Returns whether or not the extension (suffix) of the given URL's pathname is prohibited
  *
- * This checks {@code window.location.pathname} against a set of file extensions
- * that we should not inject the provider into. This check is indifferent of
- * query parameters in the location.
+ * This checks the provided URL's pathname against a set of file extensions
+ * that we should not inject the provider into.
  *
- * @returns {boolean} whether or not the extension of the current document is prohibited
+ * @param {URL} url - The URL to check
+ * @returns {boolean} whether or not the extension of the given URL's pathname is prohibited
  */
-function suffixCheck() {
+function suffixCheck({ pathname }) {
   const prohibitedTypes = [/\.xml$/u, /\.pdf$/u];
-  const currentUrl = window.location.pathname;
   for (let i = 0; i < prohibitedTypes.length; i++) {
-    if (prohibitedTypes[i].test(currentUrl)) {
+    if (prohibitedTypes[i].test(pathname)) {
       return false;
     }
   }
@@ -46,24 +42,12 @@ function suffixCheck() {
 }
 
 /**
- * Checks the documentElement of the current document
+ * Checks if the given domain is blocked
  *
- * @returns {boolean} {@code true} if the documentElement is an html node or if none exists
+ * @param {URL} url - The URL to check
+ * @returns {boolean} {@code true} if the given domain is blocked
  */
-function documentElementCheck() {
-  const documentElement = document.documentElement.nodeName;
-  if (documentElement) {
-    return documentElement.toLowerCase() === 'html';
-  }
-  return true;
-}
-
-/**
- * Checks if the current domain is blocked
- *
- * @returns {boolean} {@code true} if the current domain is blocked
- */
-function blockedDomainCheck() {
+function blockedDomainCheck(url) {
   // If making any changes, please also update the same list found in the MetaMask-Mobile & SDK repositories
   const blockedDomains = [
     'execution.consensys.io',
@@ -85,8 +69,7 @@ function blockedDomainCheck() {
     'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
   ];
 
-  const { hostname: currentHostname, pathname: currentPathname } =
-    window.location;
+  const { hostname: currentHostname, pathname: currentPathname } = url;
 
   const trimTrailingSlash = (str) =>
     str.endsWith('/') ? str.slice(0, -1) : str;
@@ -104,3 +87,38 @@ function blockedDomainCheck() {
     )
   );
 }
+
+/**
+ * Checks if the document is suitable for provider injection by verifying the doctype and document element.
+ *
+ * @returns {boolean} `true` if the document passes both the doctype and document element checks, otherwise `false`.
+ */
+export function checkDocumentForProviderInjection() {
+  return doctypeCheck() && documentElementCheck();
+}
+
+/**
+ * Checks the doctype of the current document if it exists
+ *
+ * @returns {boolean} {@code true} if the doctype is html or if none exists
+ */
+function doctypeCheck() {
+  const { doctype } = window.document;
+  if (doctype) {
+    return doctype.name === 'html';
+  }
+  return true;
+}
+
+/**
+ * Checks the documentElement of the current document
+ *
+ * @returns {boolean} {@code true} if the documentElement is an html node or if none exists
+ */
+function documentElementCheck() {
+  const documentElement = document.documentElement.nodeName;
+  if (documentElement) {
+    return documentElement.toLowerCase() === 'html';
+  }
+  return true;
+}
diff --git a/shared/modules/provider-injection.test.ts b/shared/modules/provider-injection.test.ts
index 1742e31b4db6..c7da24b46642 100644
--- a/shared/modules/provider-injection.test.ts
+++ b/shared/modules/provider-injection.test.ts
@@ -8,11 +8,7 @@ describe('shouldInjectProvider', () => {
     const urlObj = new URL(urlString);
 
     mockedWindow.mockImplementation(() => ({
-      location: {
-        hostname: urlObj.hostname,
-        origin: urlObj.origin,
-        pathname: urlObj.pathname,
-      },
+      location: urlObj,
       document: {
         doctype: {
           name: 'html',
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index 2d3d2999ed43..fd2d5be42891 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -193,6 +193,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         currentLocale: 'en',
         useExternalServices: true,
         dismissSeedBackUpReminder: true,
+        overrideContentSecurityPolicyHeader: true,
         featureFlags: {},
         forgottenPassword: false,
         identities: {
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 334e2f74ceca..bea9e9bad77f 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -63,6 +63,7 @@ function onboardingFixture() {
         advancedGasFee: {},
         currentLocale: 'en',
         dismissSeedBackUpReminder: false,
+        overrideContentSecurityPolicyHeader: true,
         featureFlags: {},
         forgottenPassword: false,
         identities: {},
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 1cb9e47f1f80..c3705c1ebf6c 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -65,6 +65,7 @@ async function withFixtures(options, testSuite) {
     smartContract,
     driverOptions,
     dappOptions,
+    staticServerOptions,
     title,
     ignoredConsoleErrors = [],
     dappPath = undefined,
@@ -159,7 +160,9 @@ async function withFixtures(options, testSuite) {
             'dist',
           );
         }
-        dappServer.push(createStaticServer(dappDirectory));
+        dappServer.push(
+          createStaticServer({ public: dappDirectory, ...staticServerOptions }),
+        );
         dappServer[i].listen(`${dappBasePort + i}`);
         await new Promise((resolve, reject) => {
           dappServer[i].on('listening', resolve);
diff --git a/test/e2e/phishing-warning-page-server.js b/test/e2e/phishing-warning-page-server.js
index 2f6099e1a3d0..a66c9211ed83 100644
--- a/test/e2e/phishing-warning-page-server.js
+++ b/test/e2e/phishing-warning-page-server.js
@@ -13,7 +13,7 @@ const phishingWarningDirectory = path.resolve(
 
 class PhishingWarningPageServer {
   constructor() {
-    this._server = createStaticServer(phishingWarningDirectory);
+    this._server = createStaticServer({ public: phishingWarningDirectory });
   }
 
   async start({ port = 9999 } = {}) {
diff --git a/test/e2e/tests/content-security-policy/content-security-policy-mock-page/index.html b/test/e2e/tests/content-security-policy/content-security-policy-mock-page/index.html
new file mode 100644
index 000000000000..dae42d094890
--- /dev/null
+++ b/test/e2e/tests/content-security-policy/content-security-policy-mock-page/index.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <title>Mock CSP header testing</title>
+</head>
+<body>
+	<div>Mock Page for Content-Security-Policy header testing</div>
+</body>
+</html>
diff --git a/test/e2e/tests/content-security-policy/content-security-policy.spec.ts b/test/e2e/tests/content-security-policy/content-security-policy.spec.ts
new file mode 100644
index 000000000000..996c64343c5b
--- /dev/null
+++ b/test/e2e/tests/content-security-policy/content-security-policy.spec.ts
@@ -0,0 +1,46 @@
+import { strict as assert } from 'assert';
+import { Suite } from 'mocha';
+import {
+  defaultGanacheOptions,
+  openDapp,
+  unlockWallet,
+  withFixtures,
+} from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+
+describe('Content-Security-Policy', function (this: Suite) {
+  it('opening a restricted website should still load the extension', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        dappPaths: [
+          './tests/content-security-policy/content-security-policy-mock-page',
+        ],
+        staticServerOptions: {
+          headers: [
+            {
+              source: 'index.html',
+              headers: [
+                {
+                  key: 'Content-Security-Policy',
+                  value: `default-src 'none'`,
+                },
+              ],
+            },
+          ],
+        },
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await openDapp(driver);
+        const isExtensionLoaded: boolean = await driver.executeScript(
+          'return typeof window.ethereum !== "undefined"',
+        );
+        assert.equal(isExtensionLoaded, 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 1a871780591f..cebacab2b1d9 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
@@ -198,6 +198,7 @@
     "useNonceField": false,
     "usePhishDetect": true,
     "dismissSeedBackUpReminder": true,
+    "overrideContentSecurityPolicyHeader": true,
     "useMultiAccountBalanceChecker": true,
     "useSafeChainsListValidation": "boolean",
     "useTokenDetection": true,
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 e8f8f81a6293..97399d34c508 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
@@ -115,6 +115,7 @@
     "useNonceField": false,
     "usePhishDetect": true,
     "dismissSeedBackUpReminder": true,
+    "overrideContentSecurityPolicyHeader": true,
     "useMultiAccountBalanceChecker": true,
     "useSafeChainsListValidation": true,
     "useTokenDetection": true,
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 1a51023a2ca1..7622ad15937c 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
@@ -115,6 +115,7 @@
       "currentLocale": "en",
       "useExternalServices": "boolean",
       "dismissSeedBackUpReminder": true,
+      "overrideContentSecurityPolicyHeader": true,
       "featureFlags": {},
       "forgottenPassword": false,
       "identities": "object",
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 bf7f87a16134..b3fa8d117beb 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
@@ -115,6 +115,7 @@
       "currentLocale": "en",
       "useExternalServices": "boolean",
       "dismissSeedBackUpReminder": true,
+      "overrideContentSecurityPolicyHeader": true,
       "featureFlags": {},
       "forgottenPassword": false,
       "identities": "object",
diff --git a/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js b/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
index 917e289f320f..8e4254fb8b34 100644
--- a/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
+++ b/test/e2e/tests/synchronous-injection/synchronous-injection.spec.js
@@ -7,7 +7,7 @@ const dappPort = 8080;
 
 describe('The provider', function () {
   it('can be injected synchronously and successfully used by a dapp', async function () {
-    const dappServer = createStaticServer(__dirname);
+    const dappServer = createStaticServer({ public: __dirname });
     dappServer.listen(dappPort);
     await new Promise((resolve, reject) => {
       dappServer.on('listening', resolve);
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index c22b0cbcf183..232bcdae5aff 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -1,4 +1,8 @@
 /* eslint-disable @metamask/design-tokens/color-no-hex*/
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { getPlatform } from '../../../app/scripts/lib/util';
+import { PLATFORM_FIREFOX } from '../../../shared/constants/app';
 import { IconName } from '../../components/component-library';
 import {
   ADVANCED_ROUTE,
@@ -19,6 +23,7 @@ import {
  * # @param {string} route tab route with appended arbitrary, unique anchor tag / hash route
  * # @param {string} iconName
  * # @param {string} featureFlag ENV variable name. If the ENV value exists, the route will be searchable; else, route will not be searchable.
+ * # @param {boolean} hidden If true, the route will not be searchable.
  */
 
 /** @type {SettingRouteConfig[]} */
@@ -154,6 +159,16 @@ const SETTINGS_CONSTANTS = [
     route: `${ADVANCED_ROUTE}#export-data`,
     icon: 'fas fa-download',
   },
+  // advanced settingsRefs[11]
+  {
+    tabMessage: (t) => t('advanced'),
+    sectionMessage: (t) => t('overrideContentSecurityPolicyHeader'),
+    descriptionMessage: (t) =>
+      t('overrideContentSecurityPolicyHeaderDescription'),
+    route: `${ADVANCED_ROUTE}#override-content-security-policy-header`,
+    icon: 'fas fa-sliders-h',
+    hidden: getPlatform() !== PLATFORM_FIREFOX,
+  },
   {
     tabMessage: (t) => t('contacts'),
     sectionMessage: (t) => t('contacts'),
diff --git a/ui/helpers/utils/settings-search.js b/ui/helpers/utils/settings-search.js
index 07b4501c0208..8c11ad8fad52 100644
--- a/ui/helpers/utils/settings-search.js
+++ b/ui/helpers/utils/settings-search.js
@@ -8,8 +8,10 @@ export function getSettingsRoutes() {
   if (settingsRoutes) {
     return settingsRoutes;
   }
-  settingsRoutes = SETTINGS_CONSTANTS.filter((routeObject) =>
-    routeObject.featureFlag ? process.env[routeObject.featureFlag] : true,
+  settingsRoutes = SETTINGS_CONSTANTS.filter(
+    (routeObject) =>
+      (routeObject.featureFlag ? process.env[routeObject.featureFlag] : true) &&
+      !routeObject.hidden,
   );
   return settingsRoutes;
 }
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index cc7b875d8c5e..30af3ee6b9da 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -68,6 +68,10 @@ const t = (key) => {
       return 'Dismiss Secret Recovery Phrase backup reminder';
     case 'dismissReminderDescriptionField':
       return 'Turn this on to dismiss the Secret Recovery Phrase backup reminder message. We highly recommend that you back up your Secret Recovery Phrase to avoid loss of funds';
+    case 'overrideContentSecurityPolicyHeader':
+      return 'Override Content-Security-Policy header';
+    case 'overrideContentSecurityPolicyHeaderDescription':
+      return "This option is a workaround for a known issue in Firefox, where a dapp's Content-Security-Policy header may prevent the extension from loading properly. Disabling this option is not recommended unless required for specific web page compatibility.";
     case 'Contacts':
       return 'Contacts';
     case 'securityAndPrivacy':
@@ -147,9 +151,12 @@ describe('Settings Search Utils', () => {
   describe('getSettingsRoutes', () => {
     it('should be an array of settings routes objects', () => {
       const NUM_OF_ENV_FEATURE_FLAG_SETTINGS = 4;
+      const NUM_OF_HIDDEN_SETTINGS = 1;
 
       expect(getSettingsRoutes()).toHaveLength(
-        SETTINGS_CONSTANTS.length - NUM_OF_ENV_FEATURE_FLAG_SETTINGS,
+        SETTINGS_CONSTANTS.length -
+          NUM_OF_ENV_FEATURE_FLAG_SETTINGS -
+          NUM_OF_HIDDEN_SETTINGS,
       );
     });
   });
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 132b97f7caa9..6be7bcd52004 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -29,6 +29,10 @@ import {
   getNumberOfSettingRoutesInTab,
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
+// TODO: Remove restricted import
+// eslint-disable-next-line import/no-restricted-paths
+import { getPlatform } from '../../../../app/scripts/lib/util';
+import { PLATFORM_FIREFOX } from '../../../../shared/constants/app';
 
 export default class AdvancedTab extends PureComponent {
   static contextTypes = {
@@ -58,6 +62,8 @@ export default class AdvancedTab extends PureComponent {
     backupUserData: PropTypes.func.isRequired,
     showExtensionInFullSizeView: PropTypes.bool,
     setShowExtensionInFullSizeView: PropTypes.func.isRequired,
+    overrideContentSecurityPolicyHeader: PropTypes.bool,
+    setOverrideContentSecurityPolicyHeader: PropTypes.func.isRequired,
   };
 
   state = {
@@ -583,6 +589,42 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
+  renderOverrideContentSecurityPolicyHeader() {
+    const { t } = this.context;
+    const {
+      overrideContentSecurityPolicyHeader,
+      setOverrideContentSecurityPolicyHeader,
+    } = this.props;
+
+    return (
+      <Box
+        ref={this.settingsRefs[11]}
+        className="settings-page__content-row"
+        data-testid="advanced-setting-override-content-security-policy-header"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span>{t('overrideContentSecurityPolicyHeader')}</span>
+          <div className="settings-page__content-description">
+            {t('overrideContentSecurityPolicyHeaderDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={overrideContentSecurityPolicyHeader}
+            onToggle={(value) => setOverrideContentSecurityPolicyHeader(!value)}
+            offLabel={t('off')}
+            onLabel={t('on')}
+          />
+        </div>
+      </Box>
+    );
+  }
+
   render() {
     const { errorInSettings } = this.props;
     // When adding/removing/editing the order of renders, double-check the order of the settingsRefs. This affects settings-search.js
@@ -602,6 +644,9 @@ export default class AdvancedTab extends PureComponent {
         {this.renderAutoLockTimeLimit()}
         {this.renderUserDataBackup()}
         {this.renderDismissSeedBackupReminderControl()}
+        {getPlatform() === PLATFORM_FIREFOX
+          ? this.renderOverrideContentSecurityPolicyHeader()
+          : null}
       </div>
     );
   }
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index aaa094e0655c..0be61499c1af 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -7,6 +7,7 @@ import {
   backupUserData,
   setAutoLockTimeLimit,
   setDismissSeedBackUpReminder,
+  setOverrideContentSecurityPolicyHeader,
   setFeatureFlag,
   setShowExtensionInFullSizeView,
   setShowFiatConversionOnTestnetsPreference,
@@ -31,6 +32,7 @@ export const mapStateToProps = (state) => {
     featureFlags: { sendHexData } = {},
     useNonceField,
     dismissSeedBackUpReminder,
+    overrideContentSecurityPolicyHeader,
   } = metamask;
   const {
     showFiatInTestnets,
@@ -49,6 +51,7 @@ export const mapStateToProps = (state) => {
     autoLockTimeLimit,
     useNonceField,
     dismissSeedBackUpReminder,
+    overrideContentSecurityPolicyHeader,
   };
 };
 
@@ -81,6 +84,9 @@ export const mapDispatchToProps = (dispatch) => {
     setDismissSeedBackUpReminder: (value) => {
       return dispatch(setDismissSeedBackUpReminder(value));
     },
+    setOverrideContentSecurityPolicyHeader: (value) => {
+      return dispatch(setOverrideContentSecurityPolicyHeader(value));
+    },
   };
 };
 
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.stories.js b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
index 36c84cbba8c0..855bdd8aa86a 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.stories.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
@@ -12,6 +12,7 @@ export default {
     showFiatInTestnets: { control: 'boolean' },
     useLedgerLive: { control: 'boolean' },
     dismissSeedBackUpReminder: { control: 'boolean' },
+    overrideContentSecurityPolicyHeader: { control: 'boolean' },
     setAutoLockTimeLimit: { action: 'setAutoLockTimeLimit' },
     setShowFiatConversionOnTestnetsPreference: {
       action: 'setShowFiatConversionOnTestnetsPreference',
@@ -20,6 +21,9 @@ export default {
     setIpfsGateway: { action: 'setIpfsGateway' },
     setIsIpfsGatewayEnabled: { action: 'setIsIpfsGatewayEnabled' },
     setDismissSeedBackUpReminder: { action: 'setDismissSeedBackUpReminder' },
+    setOverrideContentSecurityPolicyHeader: {
+      action: 'setOverrideContentSecurityPolicyHeader',
+    },
     setUseNonceField: { action: 'setUseNonceField' },
     setHexDataFeatureFlag: { action: 'setHexDataFeatureFlag' },
     displayErrorInSettings: { action: 'displayErrorInSettings' },
@@ -38,6 +42,7 @@ export const DefaultStory = (args) => {
       sendHexData,
       showFiatInTestnets,
       dismissSeedBackUpReminder,
+      overrideContentSecurityPolicyHeader,
     },
     updateArgs,
   ] = useArgs();
@@ -65,6 +70,12 @@ export const DefaultStory = (args) => {
       dismissSeedBackUpReminder: !dismissSeedBackUpReminder,
     });
   };
+
+  const handleOverrideContentSecurityPolicyHeader = () => {
+    updateArgs({
+      overrideContentSecurityPolicyHeader: !overrideContentSecurityPolicyHeader,
+    });
+  };
   return (
     <div style={{ flex: 1, height: 500 }}>
       <AdvancedTab
@@ -77,6 +88,12 @@ export const DefaultStory = (args) => {
         setShowFiatConversionOnTestnetsPreference={handleShowFiatInTestnets}
         dismissSeedBackUpReminder={dismissSeedBackUpReminder}
         setDismissSeedBackUpReminder={handleDismissSeedBackUpReminder}
+        overrideContentSecurityPolicyHeader={
+          overrideContentSecurityPolicyHeader
+        }
+        setOverrideContentSecurityPolicyHeader={
+          handleOverrideContentSecurityPolicyHeader
+        }
         ipfsGateway="ipfs-gateway"
       />
     </div>
@@ -91,4 +108,5 @@ DefaultStory.args = {
   showFiatInTestnets: false,
   useLedgerLive: false,
   dismissSeedBackUpReminder: false,
+  overrideContentSecurityPolicyHeader: true,
 };
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 4f66067a5759..67de497817c8 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4218,6 +4218,18 @@ export function setDismissSeedBackUpReminder(
   };
 }
 
+export function setOverrideContentSecurityPolicyHeader(
+  value: boolean,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    dispatch(showLoadingIndication());
+    await submitRequestToBackground('setOverrideContentSecurityPolicyHeader', [
+      value,
+    ]);
+    dispatch(hideLoadingIndication());
+  };
+}
+
 export function getRpcMethodPreferences(): ThunkAction<
   void,
   MetaMaskReduxState,
diff --git a/yarn.lock b/yarn.lock
index f22f36057099..4352ef21767a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11134,6 +11134,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/serve-handler@npm:^6.1.4":
+  version: 6.1.4
+  resolution: "@types/serve-handler@npm:6.1.4"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/c92ae204605659b37202af97cfcc7690be43b9290692c1d6c3c93805b399044fd67573af4eb2e7b1fd975451db6d0d5c6cd2f09b20997209fa3341f345f661e4
+  languageName: node
+  linkType: hard
+
 "@types/serve-index@npm:^1.9.4":
   version: 1.9.4
   resolution: "@types/serve-index@npm:1.9.4"
@@ -26654,6 +26663,7 @@ __metadata:
     "@types/redux-mock-store": "npm:1.0.6"
     "@types/remote-redux-devtools": "npm:^0.5.5"
     "@types/selenium-webdriver": "npm:^4.1.19"
+    "@types/serve-handler": "npm:^6.1.4"
     "@types/sinon": "npm:^10.0.13"
     "@types/sprintf-js": "npm:^1"
     "@types/w3c-web-hid": "npm:^1.0.3"

From 82fdd64f5787ac4da20d2da6ddcd55787d136163 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:16:31 -0800
Subject: [PATCH 056/111] fix: Bug 28347 - Privacy mode tweaks (#28367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Privacy Mode should only effect PortfolioView and main account picker
popover. It should not impact other areas of the App like Send/Swap/Gas
because the toggle only exists on PortfolioView.

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

## **Related issues**

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

## **Manual testing steps**

You can toggle privacyMode with eyeball on main PortfolioView

Should respect privacyMode:
1. Go to PortfolioView, toggling eyeball should show/hide balances for
tokens as well as main balance
2. Go to AccountPicker from main Portfolio View, balances should
hide/show
3. Go to AccountPicker from asset detail view, balances should hide/show

Should _not_ respect privacyMode:
1. Go to AssetDetails, token balance should show on main page
2. Should not be respected on send/swap/gas screens
3. Balances should not be impacted elsewhere in the app. Please try to
verify this while reviewing.

## **Screenshots/Recordings**

https://github.com/user-attachments/assets/695fa68a-c9bb-4871-b03c-8c41c88b1344

## **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.
---
 ui/components/app/assets/token-cell/token-cell.tsx         | 5 +++--
 ui/components/app/assets/token-list/token-list.tsx         | 4 +++-
 .../user-preferenced-currency-display.component.d.ts       | 1 +
 .../user-preferenced-currency-display.component.js         | 3 +++
 ui/components/app/wallet-overview/coin-overview.tsx        | 6 +++---
 .../multichain/account-list-item/account-list-item.js      | 7 +++++++
 .../multichain/account-list-menu/account-list-menu.tsx     | 3 +++
 .../ui/currency-display/currency-display.component.js      | 5 ++---
 ui/pages/routes/routes.component.js                        | 7 ++++++-
 ui/pages/routes/routes.container.js                        | 3 ++-
 10 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ui/components/app/assets/token-cell/token-cell.tsx b/ui/components/app/assets/token-cell/token-cell.tsx
index 3a042de1ebb8..31bb388aa65b 100644
--- a/ui/components/app/assets/token-cell/token-cell.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { getTokenList, getPreferences } from '../../../../selectors';
+import { getTokenList } from '../../../../selectors';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { TokenListItem } from '../../../multichain';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
@@ -12,6 +12,7 @@ type TokenCellProps = {
   symbol: string;
   string?: string;
   image: string;
+  privacyMode?: boolean;
   onClick?: (arg: string) => void;
 };
 
@@ -20,10 +21,10 @@ export default function TokenCell({
   image,
   symbol,
   string,
+  privacyMode = false,
   onClick,
 }: TokenCellProps) {
   const tokenList = useSelector(getTokenList);
-  const { privacyMode } = useSelector(getPreferences);
   const tokenData = Object.values(tokenList).find(
     (token) =>
       isEqualCaseInsensitive(token.symbol, symbol) &&
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index 11190c68f267..f0b17d686026 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -30,7 +30,8 @@ export default function TokenList({
   nativeToken,
 }: TokenListProps) {
   const t = useI18nContext();
-  const { tokenSortConfig, tokenNetworkFilter } = useSelector(getPreferences);
+  const { tokenSortConfig, tokenNetworkFilter, privacyMode } =
+    useSelector(getPreferences);
   const selectedAccount = useSelector(getSelectedAccount);
   const conversionRate = useSelector(getConversionRate);
   const nativeTokenWithBalance = useNativeTokenBalance();
@@ -88,6 +89,7 @@ export default function TokenList({
           <TokenCell
             key={`${tokenData.symbol}-${tokenData.address}`}
             {...tokenData}
+            privacyMode={privacyMode}
             onClick={onTokenClick}
           />
         );
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 4db61d568f4a..779309858a18 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
@@ -16,6 +16,7 @@ export type UserPrefrencedCurrencyDisplayProps = OverridingUnion<
     showCurrencySuffix?: boolean;
     shouldCheckShowNativeToken?: boolean;
     isAggregatedFiatOverviewBalance?: boolean;
+    privacyMode?: boolean;
   }
 >;
 
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
index 613b731d0a16..a466f7813672 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js
@@ -28,6 +28,7 @@ export default function UserPreferencedCurrencyDisplay({
   showNative,
   showCurrencySuffix,
   shouldCheckShowNativeToken,
+  privacyMode = false,
   ...restProps
 }) {
   // NOTE: When displaying currencies, we need the actual account to detect whether we're in a
@@ -83,6 +84,7 @@ export default function UserPreferencedCurrencyDisplay({
       numberOfDecimals={numberOfDecimals}
       prefixComponent={prefixComponent}
       suffix={showCurrencySuffix && !showEthLogo && currency}
+      privacyMode={privacyMode}
     />
   );
 }
@@ -126,6 +128,7 @@ const UserPreferencedCurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   shouldCheckShowNativeToken: PropTypes.bool,
+  privacyMode: PropTypes.bool,
 };
 
 UserPreferencedCurrencyDisplay.propTypes =
diff --git a/ui/components/app/wallet-overview/coin-overview.tsx b/ui/components/app/wallet-overview/coin-overview.tsx
index 9f267c96a53d..93d9e1061428 100644
--- a/ui/components/app/wallet-overview/coin-overview.tsx
+++ b/ui/components/app/wallet-overview/coin-overview.tsx
@@ -132,7 +132,8 @@ export const CoinOverview = ({
 
   const shouldShowPopover = useSelector(getShouldShowAggregatedBalancePopover);
   const isTestnet = useSelector(getIsTestnet);
-  const { showFiatInTestnets, privacyMode } = useSelector(getPreferences);
+  const { showFiatInTestnets, privacyMode, showNativeTokenAsMainBalance } =
+    useSelector(getPreferences);
 
   const selectedAccount = useSelector(getSelectedAccount);
   const shouldHideZeroBalanceTokens = useSelector(
@@ -143,8 +144,6 @@ export const CoinOverview = ({
     shouldHideZeroBalanceTokens,
   );
 
-  const { showNativeTokenAsMainBalance } = useSelector(getPreferences);
-
   const isEvm = useSelector(getMultichainIsEvm);
   const isNotAggregatedFiatBalance =
     showNativeTokenAsMainBalance || isTestnet || !isEvm;
@@ -281,6 +280,7 @@ export const CoinOverview = ({
                     isAggregatedFiatOverviewBalance={
                       !showNativeTokenAsMainBalance && !isTestnet
                     }
+                    privacyMode={privacyMode}
                   />
                   <ButtonIcon
                     color={IconColor.iconAlternative}
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 9e070b33954b..143c4d142a16 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -87,6 +87,7 @@ const AccountListItem = ({
   startAccessory,
   onActionClick,
   shouldScrollToWhenSelected = true,
+  privacyMode = false,
 }) => {
   const t = useI18nContext();
   const [accountOptionsMenuOpen, setAccountOptionsMenuOpen] = useState(false);
@@ -313,6 +314,7 @@ const AccountListItem = ({
                 type={PRIMARY}
                 showFiat={showFiat}
                 data-testid="first-currency-display"
+                privacyMode={privacyMode}
               />
             </Text>
           </Box>
@@ -360,6 +362,7 @@ const AccountListItem = ({
                   type={SECONDARY}
                   showNative
                   data-testid="second-currency-display"
+                  privacyMode={privacyMode}
                 />
               </Text>
             </Box>
@@ -507,6 +510,10 @@ AccountListItem.propTypes = {
    * Determines if list item should be scrolled to when selected
    */
   shouldScrollToWhenSelected: PropTypes.bool,
+  /**
+   * Determines if list balance should be obfuscated
+   */
+  privacyMode: PropTypes.bool,
 };
 
 AccountListItem.displayName = 'AccountListItem';
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 eff0d3cb8868..cfb49d246ca6 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -188,6 +188,7 @@ export const mergeAccounts = (
 
 type AccountListMenuProps = {
   onClose: () => void;
+  privacyMode?: boolean;
   showAccountCreation?: boolean;
   accountListItemProps?: object;
   allowedAccountTypes?: KeyringAccountType[];
@@ -195,6 +196,7 @@ type AccountListMenuProps = {
 
 export const AccountListMenu = ({
   onClose,
+  privacyMode = false,
   showAccountCreation = true,
   accountListItemProps,
   allowedAccountTypes = [
@@ -644,6 +646,7 @@ export const AccountListMenu = ({
                       isHidden={Boolean(account.hidden)}
                       currentTabOrigin={currentTabOrigin}
                       isActive={Boolean(account.active)}
+                      privacyMode={privacyMode}
                       {...accountListItemProps}
                     />
                   </Box>
diff --git a/ui/components/ui/currency-display/currency-display.component.js b/ui/components/ui/currency-display/currency-display.component.js
index a0bb114409f6..7e2569ffaee3 100644
--- a/ui/components/ui/currency-display/currency-display.component.js
+++ b/ui/components/ui/currency-display/currency-display.component.js
@@ -1,10 +1,8 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
 import { EtherDenomination } from '../../../../shared/constants/common';
-import { getPreferences } from '../../../selectors';
 import { SensitiveText, Box } from '../../component-library';
 import {
   AlignItems,
@@ -35,9 +33,9 @@ export default function CurrencyDisplay({
   textProps = {},
   suffixProps = {},
   isAggregatedFiatOverviewBalance = false,
+  privacyMode = false,
   ...props
 }) {
-  const { privacyMode } = useSelector(getPreferences);
   const [title, parts] = useCurrencyDisplay(value, {
     account,
     displayValue,
@@ -125,6 +123,7 @@ const CurrencyDisplayPropTypes = {
   textProps: PropTypes.object,
   suffixProps: PropTypes.object,
   isAggregatedFiatOverviewBalance: PropTypes.bool,
+  privacyMode: PropTypes.bool,
 };
 
 CurrencyDisplay.propTypes = CurrencyDisplayPropTypes;
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index e26e17be9e23..83e707c30f85 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -138,6 +138,7 @@ export default class Routes extends Component {
     history: PropTypes.object,
     location: PropTypes.object,
     autoLockTimeLimit: PropTypes.number,
+    privacyMode: PropTypes.bool,
     pageChanged: PropTypes.func.isRequired,
     browserEnvironmentOs: PropTypes.string,
     browserEnvironmentBrowser: PropTypes.string,
@@ -417,6 +418,7 @@ export default class Routes extends Component {
       switchedNetworkDetails,
       clearSwitchedNetworkDetails,
       clearEditedNetwork,
+      privacyMode,
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       isShowKeyringSnapRemovalResultModal,
       hideShowKeyringSnapRemovalResultModal,
@@ -494,7 +496,10 @@ export default class Routes extends Component {
           ///: END:ONLY_INCLUDE_IF
         }
         {isAccountMenuOpen ? (
-          <AccountListMenu onClose={() => toggleAccountMenu()} />
+          <AccountListMenu
+            onClose={() => toggleAccountMenu()}
+            privacyMode={privacyMode}
+          />
         ) : null}
         {isNetworkMenuOpen ? (
           <NetworkListMenu
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 7553e59963d2..5c08e939d1d1 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -55,7 +55,7 @@ import Routes from './routes.component';
 function mapStateToProps(state) {
   const { activeTab, appState } = state;
   const { alertOpen, alertMessage, isLoading, loadingMessage } = appState;
-  const { autoLockTimeLimit = DEFAULT_AUTO_LOCK_TIME_LIMIT } =
+  const { autoLockTimeLimit = DEFAULT_AUTO_LOCK_TIME_LIMIT, privacyMode } =
     getPreferences(state);
   const { completedOnboarding } = state.metamask;
 
@@ -81,6 +81,7 @@ function mapStateToProps(state) {
     isNetworkLoading: isNetworkLoading(state),
     currentCurrency: state.metamask.currentCurrency,
     autoLockTimeLimit,
+    privacyMode,
     browserEnvironmentOs: state.metamask.browserEnvironment?.os,
     browserEnvironmentContainter: state.metamask.browserEnvironment?.browser,
     providerId: getNetworkIdentifier(state),

From f3f6507d5b5b118c0f1529a15d63da3af7d63a58 Mon Sep 17 00:00:00 2001
From: Howard Braham <howrad@gmail.com>
Date: Thu, 7 Nov 2024 17:34:47 -0800
Subject: [PATCH 057/111] build: update yarn to v4.5.1 (#28365)

## **Description**

Updates yarn to the latest v4.5.1, and adjusts LavaMoat policies to
accommodate.

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

<!--## **Related issues**
## **Manual testing steps**
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
## **Pre-merge reviewer checklist**-->
---
 .../generate-attributions/package.json        |  2 +-
 lavamoat/build-system/policy.json             | 20 ++-----------------
 package.json                                  |  2 +-
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/development/generate-attributions/package.json b/development/generate-attributions/package.json
index 92bf1a5153c2..5778cbd0c634 100644
--- a/development/generate-attributions/package.json
+++ b/development/generate-attributions/package.json
@@ -9,7 +9,7 @@
   },
   "engines": {
     "node": ">= 20",
-    "yarn": "^4.4.1"
+    "yarn": "^4.5.1"
   },
   "lavamoat": {
     "allowScripts": {
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 5a607452526c..2d6b7ce3ad14 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -3004,7 +3004,7 @@
         "eslint-plugin-prettier": true,
         "eslint-plugin-react": true,
         "eslint-plugin-react-hooks": true,
-        "eslint>@eslint/eslintrc>ajv": true,
+        "eslint>ajv": true,
         "eslint>globals": true,
         "eslint>ignore": true,
         "eslint>minimatch": true,
@@ -3012,17 +3012,6 @@
         "nock>debug": true
       }
     },
-    "eslint>@eslint/eslintrc>ajv": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "eslint>@eslint/eslintrc>ajv>json-schema-traverse": true,
-        "eslint>fast-deep-equal": true,
-        "uri-js": true
-      }
-    },
     "eslint>@eslint/eslintrc>import-fresh": {
       "builtin": {
         "path.dirname": true
@@ -8491,17 +8480,12 @@
         "process.stdout.write": true
       },
       "packages": {
+        "eslint>ajv": true,
         "lodash": true,
-        "stylelint>table>ajv": true,
         "stylelint>table>slice-ansi": true,
         "stylelint>table>string-width": true
       }
     },
-    "stylelint>table>ajv": {
-      "packages": {
-        "eslint>fast-deep-equal": true
-      }
-    },
     "stylelint>table>slice-ansi": {
       "packages": {
         "stylelint>table>slice-ansi>ansi-styles": true,
diff --git a/package.json b/package.json
index c612dd76fb20..338e3eaa2068 100644
--- a/package.json
+++ b/package.json
@@ -751,5 +751,5 @@
       "jest-preview": false
     }
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.1"
 }

From 04dd7d318ec039640960f1fcd4ba26acedb7940e Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 8 Nov 2024 10:17:15 +0000
Subject: [PATCH 058/111] fix: gas limit estimation (#28327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Upgrade transaction controller to fix gas limit estimation on specific
networks.

## **Related issues**

Fixes: #28307 #28175

## **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/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.
---
 package.json                                  |  2 +-
 test/e2e/flask/user-operations.spec.ts        |  6 +++--
 .../tests/transaction/edit-gas-fee.spec.js    | 16 +++++------
 .../transaction/multiple-transactions.spec.js | 27 ++++++++-----------
 yarn.lock                                     | 12 ++++-----
 5 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 338e3eaa2068..13bddaa69287 100644
--- a/package.json
+++ b/package.json
@@ -347,7 +347,7 @@
     "@metamask/snaps-sdk": "^6.10.0",
     "@metamask/snaps-utils": "^8.5.1",
     "@metamask/solana-wallet-snap": "^0.1.9",
-    "@metamask/transaction-controller": "^38.1.0",
+    "@metamask/transaction-controller": "^38.3.0",
     "@metamask/user-operation-controller": "^13.0.0",
     "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/test/e2e/flask/user-operations.spec.ts b/test/e2e/flask/user-operations.spec.ts
index be7141444c97..7512e0b563c9 100644
--- a/test/e2e/flask/user-operations.spec.ts
+++ b/test/e2e/flask/user-operations.spec.ts
@@ -256,7 +256,8 @@ describe('User Operations', function () {
         from: ERC_4337_ACCOUNT,
         to: GANACHE_ACCOUNT,
         value: convertETHToHexGwei(1),
-        data: '0x',
+        maxFeePerGas: '0x0',
+        maxPriorityFeePerGas: '0x0',
       });
 
       await confirmTransaction(driver);
@@ -294,7 +295,8 @@ describe('User Operations', function () {
           from: ERC_4337_ACCOUNT,
           to: GANACHE_ACCOUNT,
           value: convertETHToHexGwei(1),
-          data: '0x',
+          maxFeePerGas: '0x0',
+          maxPriorityFeePerGas: '0x0',
         });
 
         await confirmTransaction(driver);
diff --git a/test/e2e/tests/transaction/edit-gas-fee.spec.js b/test/e2e/tests/transaction/edit-gas-fee.spec.js
index 85ae4da3a31f..918831f8f3ad 100644
--- a/test/e2e/tests/transaction/edit-gas-fee.spec.js
+++ b/test/e2e/tests/transaction/edit-gas-fee.spec.js
@@ -1,11 +1,11 @@
 const { strict: assert } = require('assert');
 const {
   createInternalTransaction,
+  createDappTransaction,
 } = require('../../page-objects/flows/transaction');
 
 const {
   withFixtures,
-  openDapp,
   unlockWallet,
   generateGanacheOptions,
   WINDOW_TITLES,
@@ -172,11 +172,9 @@ describe('Editing Confirm Transaction', function () {
         // login to extension
         await unlockWallet(driver);
 
-        // open dapp and connect
-        await openDapp(driver);
-        await driver.clickElement({
-          text: 'Send EIP 1559 Transaction',
-          tag: 'button',
+        await createDappTransaction(driver, {
+          maxFeePerGas: '0x2000000000',
+          maxPriorityFeePerGas: '0x1000000000',
         });
 
         // check transaction in extension popup
@@ -198,12 +196,12 @@ describe('Editing Confirm Transaction', function () {
           '.currency-display-component__text',
         );
         const transactionAmount = transactionAmounts[0];
-        assert.equal(await transactionAmount.getText(), '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.00021',
+          text: '0.00185144',
         });
 
         // confirms the transaction
@@ -227,7 +225,7 @@ describe('Editing Confirm Transaction', function () {
           '[data-testid="transaction-list-item-primary-currency"]',
         );
         assert.equal(txValues.length, 1);
-        assert.ok(/-0\s*ETH/u.test(await txValues[0].getText()));
+        assert.ok(/-0.001\s*ETH/u.test(await txValues[0].getText()));
       },
     );
   });
diff --git a/test/e2e/tests/transaction/multiple-transactions.spec.js b/test/e2e/tests/transaction/multiple-transactions.spec.js
index 8f1318c31e3b..4d913cb07edb 100644
--- a/test/e2e/tests/transaction/multiple-transactions.spec.js
+++ b/test/e2e/tests/transaction/multiple-transactions.spec.js
@@ -26,19 +26,13 @@ describe('Multiple transactions', function () {
         // initiates a transaction from the dapp
         await openDapp(driver);
         // creates first transaction
-        await driver.clickElement({
-          text: 'Send EIP 1559 Transaction',
-          tag: 'button',
-        });
+        await createDappTransaction(driver);
         await driver.waitUntilXWindowHandles(3);
 
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
 
         // creates second transaction
-        await driver.clickElement({
-          text: 'Send EIP 1559 Transaction',
-          tag: 'button',
-        });
+        await createDappTransaction(driver);
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
         // confirms second transaction
@@ -94,19 +88,13 @@ describe('Multiple transactions', function () {
         // initiates a transaction from the dapp
         await openDapp(driver);
         // creates first transaction
-        await driver.clickElement({
-          text: 'Send EIP 1559 Transaction',
-          tag: 'button',
-        });
+        await createDappTransaction(driver);
         await driver.waitUntilXWindowHandles(3);
 
         await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
 
         // creates second transaction
-        await driver.clickElement({
-          text: 'Send EIP 1559 Transaction',
-          tag: 'button',
-        });
+        await createDappTransaction(driver);
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
         // rejects second transaction
@@ -141,3 +129,10 @@ describe('Multiple transactions', function () {
     );
   });
 });
+
+async function createDappTransaction(driver) {
+  await driver.clickElement({
+    text: 'Send EIP 1559 Without Gas',
+    tag: 'button',
+  });
+}
diff --git a/yarn.lock b/yarn.lock
index 4352ef21767a..bb91a8129ac2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6458,9 +6458,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^38.1.0":
-  version: 38.1.0
-  resolution: "@metamask/transaction-controller@npm:38.1.0"
+"@metamask/transaction-controller@npm:^38.3.0":
+  version: 38.3.0
+  resolution: "@metamask/transaction-controller@npm:38.3.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6469,7 +6469,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.1"
+    "@metamask/controller-utils": "npm:^11.4.2"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/nonce-tracker": "npm:^6.0.0"
@@ -6487,7 +6487,7 @@ __metadata:
     "@metamask/approval-controller": ^7.0.0
     "@metamask/gas-fee-controller": ^22.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/c1bdca52bbbce42a76ec9c640197534ec6c223b0f5d5815acfa53490dc1175850ea9aeeb6ae3c5ec34218f0bdbbbeb3e8731e2552aa9411e3ed7798a5dea8ab5
+  checksum: 10/f4e8e3a1a31e3e62b0d1a59bbe15ebfa4dc3e4cf077fb95c1815c00661c60ef4676046c49f57eab9749cd31d3e55ac3fed7bc247e3f5a3d459f2dcb03998633d
   languageName: node
   linkType: hard
 
@@ -26590,7 +26590,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:^38.1.0"
+    "@metamask/transaction-controller": "npm:^38.3.0"
     "@metamask/user-operation-controller": "npm:^13.0.0"
     "@metamask/utils": "npm:^10.0.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"

From c5643837734ce1cbdd0b2e55b5c35aa5accef816 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 8 Nov 2024 10:25:30 +0000
Subject: [PATCH 059/111] refactor: remove global network usage from
 transaction confirmations (#28236)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Remove usages of global network selectors from transaction confirmation
React components and hooks.

Specifically:

- Remove usages of the following selectors:
  - `getConversionRate`
  - `getCurrentChainId`
  - `getNativeCurrency`
  - `getNetworkIdentifier`
  - `getNftContracts`
  - `getNfts`
  - `getProviderConfig`
  - `getRpcPrefsForCurrentProvider`
- Add new selectors:
  - `selectConversionRateByChainId`
  - `selectNftsByChainId`
  - `selectNftContractsByChainId`
  - `selectNetworkIdentifierByChainId`
- Add ESLint rule to prevent further usage of global network selectors
in confirmations directory.

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

## **Related issues**

Fixes:
[#3469](https://github.com/MetaMask/MetaMask-planning/issues/3469)
[#3373](https://github.com/MetaMask/MetaMask-planning/issues/3373)
[#3486](https://github.com/MetaMask/MetaMask-planning/issues/3486)
[#3487](https://github.com/MetaMask/MetaMask-planning/issues/3487)

## **Manual testing steps**

Full regression of all transaction confirmations and related
functionality.

## **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.

---------

Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
---
 .eslintrc.js                                  | 25 +++++++++++
 .storybook/preview.js                         |  5 ++-
 .../confirmations/contract-interaction.ts     |  3 +-
 .../advanced-gas-fee-defaults.js              | 14 +++---
 .../advanced-gas-fee-defaults.test.js         |  4 +-
 .../confirm-hexdata/confirm-hexdata.test.js   | 18 +++++++-
 .../confirm-page-container.component.js       | 12 +++--
 .../confirm-page-container.container.js       |  3 --
 .../confirm-subtitle/confirm-subtitle.test.js |  5 ++-
 .../approve-static-simulation.tsx             |  1 +
 .../confirm/info/approve/approve.tsx          |  1 +
 .../edit-spending-cap-modal.tsx               |  1 +
 .../approve/spending-cap/spending-cap.tsx     |  1 +
 .../confirm/info/hooks/use-token-values.ts    |  1 +
 .../confirm/info/hooks/useFeeCalculations.ts  | 12 +++--
 .../advanced-details.stories.tsx              |  2 +-
 .../native-send-heading.tsx                   | 13 ++++--
 .../nft-send-heading/nft-send-heading.tsx     |  2 +
 .../transaction-data.stories.tsx              |  1 -
 .../transaction-details.stories.tsx           |  3 --
 .../title/hooks/useCurrentSpendingCap.ts      |  8 +++-
 .../contract-details-modal.js                 |  2 +-
 .../contract-token-values.js                  |  8 ++--
 .../useBalanceChanges.test.ts                 | 17 ++++---
 .../simulation-details/useBalanceChanges.ts   | 11 +++--
 .../transaction-alerts/transaction-alerts.js  | 11 ++++-
 .../transaction-alerts.stories.js             | 42 ++++++-----------
 .../transaction-alerts.test.js                | 40 ++++++++++++++++-
 .../confirm-approve-content.component.js      | 12 ++---
 .../confirm-approve/confirm-approve.js        | 26 ++++++-----
 .../confirm-send-token/confirm-send-token.js  | 20 ++++++---
 .../confirm-token-transaction-base.js         | 37 +++++++++------
 .../confirm-transaction-base.component.js     | 11 +----
 .../confirm-transaction-base.container.js     | 31 +++++++++----
 .../confirm-transaction-base.test.js          | 41 -----------------
 .../confirm-token-transaction-switch.js       |  4 +-
 .../contract-interaction.stories.tsx          | 19 ++++----
 .../confirmations/confirm/stories/utils.tsx   | 21 +--------
 ui/pages/confirmations/hooks/test-utils.js    | 12 ++---
 .../confirmations/hooks/useAssetDetails.js    | 13 ++++--
 .../hooks/useTransactionFunctionType.js       | 16 +++++--
 .../hooks/useTransactionFunctionType.test.js  | 27 ++++++++---
 .../confirmations/hooks/useTransactionInfo.js |  3 +-
 .../hooks/useTransactionInfo.test.js          |  7 ++-
 .../send/gas-display/gas-display.js           | 18 ++++----
 .../token-allowance.test.js.snap              | 14 +++---
 .../token-allowance/token-allowance.js        | 28 +++++++++---
 .../token-allowance/token-allowance.test.js   |  2 +-
 ui/selectors/selectors.js                     | 45 +++++++++++++++++++
 49 files changed, 416 insertions(+), 257 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 846158a741ef..4aa9ef688592 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -472,5 +472,30 @@ module.exports = {
         '@metamask/design-tokens/color-no-hex': 'off',
       },
     },
+    {
+      files: ['ui/pages/confirmations/**/*.{js,ts,tsx}'],
+      rules: {
+        'no-restricted-syntax': [
+          'error',
+          {
+            selector: `ImportSpecifier[imported.name=/${[
+              'getConversionRate',
+              'getCurrentChainId',
+              'getNativeCurrency',
+              'getNetworkIdentifier',
+              'getNftContracts',
+              'getNfts',
+              'getProviderConfig',
+              'getRpcPrefsForCurrentProvider',
+              'getUSDConversionRate',
+              'isCurrentProviderCustom',
+            ]
+              .map((method) => `(${method})`)
+              .join('|')}/]`,
+            message: 'Avoid using global network selectors in confirmations',
+          },
+        ],
+      },
+    },
   ],
 };
diff --git a/.storybook/preview.js b/.storybook/preview.js
index b46c91339273..525c364f2072 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -15,6 +15,7 @@ import MetaMetricsProviderStorybook from './metametrics';
 import testData from './test-data.js';
 import { Router } from 'react-router-dom';
 import { createBrowserHistory } from 'history';
+import { MemoryRouter } from 'react-router-dom';
 import { setBackgroundConnection } from '../ui/store/background-connection';
 import { metamaskStorybookTheme } from './metamask-storybook-theme';
 import { DocsContainer } from '@storybook/addon-docs';
@@ -147,7 +148,7 @@ const metamaskDecorator = (story, context) => {
 
   return (
     <Provider store={store}>
-      <Router history={history}>
+      <MemoryRouter>
         <MetaMetricsProviderStorybook>
           <AlertMetricsProvider
             metrics={{
@@ -165,7 +166,7 @@ const metamaskDecorator = (story, context) => {
             </I18nProvider>
           </AlertMetricsProvider>
         </MetaMetricsProviderStorybook>
-      </Router>
+      </MemoryRouter>
     </Provider>
   );
 };
diff --git a/test/data/confirmations/contract-interaction.ts b/test/data/confirmations/contract-interaction.ts
index 49a6e1aad1ab..cbe5dd2bd2ba 100644
--- a/test/data/confirmations/contract-interaction.ts
+++ b/test/data/confirmations/contract-interaction.ts
@@ -1,4 +1,5 @@
 import {
+  CHAIN_IDS,
   SimulationData,
   TransactionMeta,
   TransactionStatus,
@@ -18,7 +19,7 @@ export const CONTRACT_INTERACTION_SENDER_ADDRESS =
 
 export const DEPOSIT_METHOD_DATA = '0xd0e30db0';
 
-export const CHAIN_ID = '0xaa36a7';
+export const CHAIN_ID = CHAIN_IDS.GOERLI;
 
 export const genUnapprovedContractInteractionConfirmation = ({
   address = CONTRACT_INTERACTION_SENDER_ADDRESS,
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
index a52b4c16f893..106984363699 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
@@ -11,8 +11,7 @@ import {
 } from '../../../../../helpers/constants/design-system';
 import {
   getAdvancedGasFeeValues,
-  getCurrentChainId,
-  getNetworkIdentifier,
+  selectNetworkIdentifierByChainId,
 } from '../../../../../selectors';
 import { setAdvancedGasFee } from '../../../../../store/actions';
 import { useGasFeeContext } from '../../../../../contexts/gasFee';
@@ -35,11 +34,14 @@ const AdvancedGasFeeDefaults = () => {
     10,
   ).toString();
   const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
-  // This will need to use a different chainId in multinetwork
-  const chainId = useSelector(getCurrentChainId);
-  const networkIdentifier = useSelector(getNetworkIdentifier);
   const { updateTransactionEventFragment } = useTransactionEventFragment();
-  const { editGasMode } = useGasFeeContext();
+  const { editGasMode, transaction } = useGasFeeContext();
+  const { chainId } = transaction;
+
+  const networkIdentifier = useSelector((state) =>
+    selectNetworkIdentifierByChainId(state, chainId),
+  );
+
   const [isDefaultSettingsSelected, setDefaultSettingsSelected] = useState(
     Boolean(advancedGasFeeValues) &&
       advancedGasFeeValues.maxBaseFee === maxBaseFee &&
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
index 5e330a8b90c7..07c7fc8faaab 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js
@@ -21,6 +21,7 @@ import { mockNetworkState } from '../../../../../../test/stub/networks';
 import AdvancedGasFeeDefaults from './advanced-gas-fee-defaults';
 
 const TEXT_SELECTOR = 'Save these values as my default for the Goerli network.';
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
 
 jest.mock('../../../../../store/actions', () => ({
   gasFeeStartPollingByNetworkClientId: jest
@@ -43,7 +44,7 @@ const render = async (defaultGasParams, contextParams) => {
     metamask: {
       ...mockState.metamask,
       ...defaultGasParams,
-      ...mockNetworkState({ chainId: CHAIN_IDS.GOERLI }),
+      ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
       accounts: {
         [mockSelectedInternalAccount.address]: {
           address: mockSelectedInternalAccount.address,
@@ -71,6 +72,7 @@ const render = async (defaultGasParams, contextParams) => {
       (result = renderWithProvider(
         <GasFeeContextProvider
           transaction={{
+            chainId: CHAIN_ID_MOCK,
             userFeeLevel: 'medium',
           }}
           {...contextParams}
diff --git a/ui/pages/confirmations/components/confirm-hexdata/confirm-hexdata.test.js b/ui/pages/confirmations/components/confirm-hexdata/confirm-hexdata.test.js
index d31478775ba2..949b3ed92a86 100644
--- a/ui/pages/confirmations/components/confirm-hexdata/confirm-hexdata.test.js
+++ b/ui/pages/confirmations/components/confirm-hexdata/confirm-hexdata.test.js
@@ -1,20 +1,33 @@
 import React from 'react';
 
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/jest';
 
 import configureStore from '../../../../store/store';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import ConfirmHexData from './confirm-hexdata';
 
 jest.mock('../../../../../shared/lib/fetch-with-cache');
 
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
+
+const STATE_MOCK = {
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  },
+};
+
 describe('ConfirmHexData', () => {
-  const store = configureStore(mockState);
+  const store = configureStore(STATE_MOCK);
 
   it('should render function type', async () => {
     const { findByText } = renderWithProvider(
       <ConfirmHexData
         txData={{
+          chainId: CHAIN_ID_MOCK,
           txParams: {
             to: '0x8eeee1781fd885ff5ddef7789486676961873d12',
             data: '0x608060405234801',
@@ -34,6 +47,7 @@ describe('ConfirmHexData', () => {
       const { container } = renderWithProvider(
         <ConfirmHexData
           txData={{
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               data,
             },
@@ -51,6 +65,7 @@ describe('ConfirmHexData', () => {
     const { container } = renderWithProvider(
       <ConfirmHexData
         txData={{
+          chainId: CHAIN_ID_MOCK,
           txParams: {
             data: '0x608060405234801',
           },
@@ -67,6 +82,7 @@ describe('ConfirmHexData', () => {
     const { getByText } = renderWithProvider(
       <ConfirmHexData
         txData={{
+          chainId: CHAIN_ID_MOCK,
           txParams: {},
           origin: 'https://metamask.github.io',
           type: 'transfer',
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
index c61a4193ccd0..725c85f71a60 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.component.js
@@ -44,8 +44,8 @@ import {
   getAddressBookEntry,
   getInternalAccounts,
   getMetadataContractName,
-  getNetworkIdentifier,
   getSwapsDefaultToken,
+  selectNetworkIdentifierByChainId,
 } from '../../../../selectors';
 import useRamps from '../../../../hooks/ramps/useRamps/useRamps';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
@@ -120,7 +120,6 @@ const ConfirmPageContainer = (props) => {
     useState(false);
   const isBuyableChain = useSelector(getIsNativeTokenBuyable);
   const contact = useSelector((state) => getAddressBookEntry(state, toAddress));
-  const networkIdentifier = useSelector(getNetworkIdentifier);
   const defaultToken = useSelector(getSwapsDefaultToken);
   const accountBalance = defaultToken.string;
   const internalAccounts = useSelector(getInternalAccounts);
@@ -139,8 +138,13 @@ const ConfirmPageContainer = (props) => {
   const shouldDisplayWarning =
     contentComponent && disabled && (errorKey || errorMessage);
 
-  const networkName =
-    NETWORK_TO_NAME_MAP[currentTransaction.chainId] || networkIdentifier;
+  const { chainId } = currentTransaction;
+
+  const networkIdentifier = useSelector((state) =>
+    selectNetworkIdentifierByChainId(state, chainId),
+  );
+
+  const networkName = NETWORK_TO_NAME_MAP[chainId] || networkIdentifier;
 
   const fetchCollectionBalance = useCallback(async () => {
     const tokenBalance = await fetchTokenBalance(
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.container.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.container.js
index db07ad4117e7..23eaa43d44ab 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.container.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container.container.js
@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 import {
   getAddressBookEntry,
-  getNetworkIdentifier,
   getSwapsDefaultToken,
   getMetadataContractName,
   getAccountName,
@@ -12,7 +11,6 @@ import ConfirmPageContainer from './confirm-page-container.component';
 function mapStateToProps(state, ownProps) {
   const to = ownProps.toAddress;
   const contact = getAddressBookEntry(state, to);
-  const networkIdentifier = getNetworkIdentifier(state);
   const defaultToken = getSwapsDefaultToken(state);
   const accountBalance = defaultToken.string;
   const internalAccounts = getInternalAccounts(state);
@@ -26,7 +24,6 @@ function mapStateToProps(state, ownProps) {
     toMetadataName,
     recipientIsOwnedAccount: Boolean(ownedAccountName),
     to,
-    networkIdentifier,
     accountBalance,
   };
 }
diff --git a/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js b/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
index baa2d112b671..fa00f0275350 100644
--- a/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
+++ b/ui/pages/confirmations/components/confirm-subtitle/confirm-subtitle.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { ERC1155, ERC721 } from '@metamask/controller-utils';
 
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import mockState from '../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import configureStore from '../../../../store/store';
 import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks';
-import { getProviderConfig } from '../../../../ducks/metamask/metamask';
 import ConfirmSubTitle from './confirm-subtitle';
 
 const mockSelectedInternalAccount =
@@ -51,7 +51,7 @@ describe('ConfirmSubTitle', () => {
     mockState.metamask.preferences.showFiatInTestnets = false;
     mockState.metamask.allNftContracts = {
       [mockSelectedInternalAccount.address]: {
-        [getProviderConfig(mockState).chainId]: [{ address: '0x9' }],
+        [CHAIN_IDS.GOERLI]: [{ address: '0x9' }],
       },
     };
     store = configureStore(mockState);
@@ -59,6 +59,7 @@ describe('ConfirmSubTitle', () => {
     const { findByText } = renderWithProvider(
       <ConfirmSubTitle
         txData={{
+          chainId: CHAIN_IDS.GOERLI,
           txParams: {
             to: '0x9',
           },
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
index ad8a3565f619..c860556a359a 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
@@ -32,6 +32,7 @@ export const ApproveStaticSimulation = () => {
     transactionMeta?.txParams?.to,
     transactionMeta?.txParams?.from,
     transactionMeta?.txParams?.data,
+    transactionMeta?.chainId,
   );
 
   const decimals = initialDecimals || '0';
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
index fa1766a8aa72..d1d9fbc08364 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve.tsx
@@ -30,6 +30,7 @@ const ApproveInfo = () => {
     transactionMeta.txParams.to,
     transactionMeta.txParams.from,
     transactionMeta.txParams.data,
+    transactionMeta.chainId,
   );
 
   const { spendingCap, pending } = useApproveTokenSimulation(
diff --git a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
index 961e63ae8f92..1eb0ac2cde05 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
@@ -54,6 +54,7 @@ export const EditSpendingCapModal = ({
     transactionMeta.txParams.to,
     transactionMeta.txParams.from,
     transactionMeta.txParams.data,
+    transactionMeta.chainId,
   );
 
   const accountBalance = calcTokenAmount(
diff --git a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
index 638ff638844c..8e7b522f050a 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx
@@ -87,6 +87,7 @@ export const SpendingCap = ({
     transactionMeta.txParams.to,
     transactionMeta.txParams.from,
     transactionMeta.txParams.data,
+    transactionMeta.chainId,
   );
 
   const accountBalance = calcTokenAmount(
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 f416282ee4ef..087a17c473c6 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
@@ -17,6 +17,7 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
     transactionMeta.txParams.to,
     transactionMeta.txParams.from,
     transactionMeta.txParams.data,
+    transactionMeta.chainId,
   );
 
   const decodedResponse = useDecodedTransactionData();
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
index 70bd2c0e3af2..5b54dcc710b8 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
@@ -12,10 +12,12 @@ import {
   multiplyHexes,
 } from '../../../../../../../shared/modules/conversion.utils';
 import { Numeric } from '../../../../../../../shared/modules/Numeric';
-import { getConversionRate } from '../../../../../../ducks/metamask/metamask';
 import { useFiatFormatter } from '../../../../../../hooks/useFiatFormatter';
 import { useGasFeeEstimates } from '../../../../../../hooks/useGasFeeEstimates';
-import { getCurrentCurrency } from '../../../../../../selectors';
+import {
+  getCurrentCurrency,
+  selectConversionRateByChainId,
+} from '../../../../../../selectors';
 import { getMultichainNetwork } from '../../../../../../selectors/multichain';
 import { HEX_ZERO } from '../shared/constants';
 import { useEIP1559TxFees } from './useEIP1559TxFees';
@@ -30,9 +32,13 @@ const EMPTY_FEES = {
 
 export function useFeeCalculations(transactionMeta: TransactionMeta) {
   const currentCurrency = useSelector(getCurrentCurrency);
-  const conversionRate = useSelector(getConversionRate);
+  const { chainId } = transactionMeta;
   const fiatFormatter = useFiatFormatter();
 
+  const conversionRate = useSelector((state) =>
+    selectConversionRateByChainId(state, chainId),
+  );
+
   const multichainNetwork = useSelector(getMultichainNetwork);
   const ticker = multichainNetwork?.network?.ticker;
 
diff --git a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.stories.tsx b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.stories.tsx
index 8654400a0bfa..aa9ec6cdc87c 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.stories.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.stories.tsx
@@ -22,6 +22,6 @@ const Story = {
 
 export default Story;
 
-export const DefaultStory = () => <AdvancedDetails />;
+export const DefaultStory = () => <AdvancedDetails overrideVisibility />;
 
 DefaultStory.storyName = 'Default';
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 bd5c7ba8b4f2..9eb70a856464 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
@@ -14,7 +14,6 @@ import {
 } from '../../../../../../../components/component-library';
 import Tooltip from '../../../../../../../components/ui/tooltip';
 import { getIntlLocale } from '../../../../../../../ducks/locale/locale';
-import { getConversionRate } from '../../../../../../../ducks/metamask/metamask';
 import {
   AlignItems,
   Display,
@@ -25,7 +24,10 @@ import {
 } from '../../../../../../../helpers/constants/design-system';
 import { MIN_AMOUNT } from '../../../../../../../hooks/useCurrencyDisplay';
 import { useFiatFormatter } from '../../../../../../../hooks/useFiatFormatter';
-import { getPreferences } from '../../../../../../../selectors';
+import {
+  getPreferences,
+  selectConversionRateByChainId,
+} from '../../../../../../../selectors';
 import { getMultichainNetwork } from '../../../../../../../selectors/multichain';
 import { useConfirmContext } from '../../../../../context/confirm';
 import {
@@ -38,11 +40,16 @@ const NativeSendHeading = () => {
   const { currentConfirmation: transactionMeta } =
     useConfirmContext<TransactionMeta>();
 
+  const { chainId } = transactionMeta;
+
   const nativeAssetTransferValue = new BigNumber(
     transactionMeta.txParams.value as string,
   ).dividedBy(new BigNumber(10).pow(18));
 
-  const conversionRate = useSelector(getConversionRate);
+  const conversionRate = useSelector((state) =>
+    selectConversionRateByChainId(state, chainId),
+  );
+
   const fiatValue =
     conversionRate &&
     nativeAssetTransferValue &&
diff --git a/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/nft-send-heading.tsx b/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/nft-send-heading.tsx
index 006613e206c9..2f36d10ce42c 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/nft-send-heading.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/nft-send-heading.tsx
@@ -24,11 +24,13 @@ const NFTSendHeading = () => {
   const tokenAddress = transactionMeta.txParams.to;
   const userAddress = transactionMeta.txParams.from;
   const { data } = transactionMeta.txParams;
+  const { chainId } = transactionMeta;
 
   const { assetName, tokenImage, tokenId } = useAssetDetails(
     tokenAddress,
     userAddress,
     data,
+    chainId,
   );
 
   const TokenImage = <AvatarToken src={tokenImage} size={AvatarTokenSize.Xl} />;
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/transaction-data.stories.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/transaction-data.stories.tsx
index 091185ae23f3..105838af78c2 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/transaction-data.stories.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/transaction-data.stories.tsx
@@ -24,7 +24,6 @@ function getStore(transactionData?: string, to?: string) {
 
   const confirmation = {
     ...confirmationTemplate,
-    chainId: '0x1',
     txParams: {
       ...confirmationTemplate.txParams,
       to: to ?? confirmationTemplate.txParams.to,
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.stories.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.stories.tsx
index dfec9c8ef4d0..f37317c230c4 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.stories.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.stories.tsx
@@ -5,7 +5,6 @@ import {
   PAYMASTER_AND_DATA,
   genUnapprovedContractInteractionConfirmation,
 } from '../../../../../../../../test/data/confirmations/contract-interaction';
-import mockState from '../../../../../../../../test/data/mock-state.json';
 import { getMockConfirmStateForTransaction } from '../../../../../../../../test/data/confirmations/helper';
 import configureStore from '../../../../../../../store/store';
 import { ConfirmContextProvider } from '../../../../../context/confirm';
@@ -20,9 +19,7 @@ function getStore() {
   return configureStore(
     getMockConfirmStateForTransaction(confirmation, {
       metamask: {
-        ...mockState.metamask,
         preferences: {
-          ...mockState.metamask.preferences,
           petnamesEnabled: true,
         },
         userOperations: {
diff --git a/ui/pages/confirmations/components/confirm/title/hooks/useCurrentSpendingCap.ts b/ui/pages/confirmations/components/confirm/title/hooks/useCurrentSpendingCap.ts
index 5f588a971561..b50948259734 100644
--- a/ui/pages/confirmations/components/confirm/title/hooks/useCurrentSpendingCap.ts
+++ b/ui/pages/confirmations/components/confirm/title/hooks/useCurrentSpendingCap.ts
@@ -32,8 +32,14 @@ export function useCurrentSpendingCap(currentConfirmation: Confirmation) {
   const txParamsData = isTxWithSpendingCap
     ? currentConfirmation.txParams.data
     : null;
+  const chainId = isTxWithSpendingCap ? currentConfirmation.chainId : null;
 
-  const { decimals } = useAssetDetails(txParamsTo, txParamsFrom, txParamsData);
+  const { decimals } = useAssetDetails(
+    txParamsTo,
+    txParamsFrom,
+    txParamsData,
+    chainId,
+  );
 
   const { spendingCap, pending } = useApproveTokenSimulation(
     currentConfirmation as TransactionMeta,
diff --git a/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js b/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
index 795401673691..f433bf4caee3 100644
--- a/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
+++ b/ui/pages/confirmations/components/contract-details-modal/contract-details-modal.js
@@ -338,7 +338,7 @@ ContractDetailsModal.propTypes = {
    */
   chainId: PropTypes.string,
   /**
-   * Block explorer URL of the current network
+   * Block explorer URL for the contract chain
    */
   blockExplorerUrl: PropTypes.string,
   /**
diff --git a/ui/pages/confirmations/components/contract-token-values/contract-token-values.js b/ui/pages/confirmations/components/contract-token-values/contract-token-values.js
index 6858689f77d0..0e8890b607ec 100644
--- a/ui/pages/confirmations/components/contract-token-values/contract-token-values.js
+++ b/ui/pages/confirmations/components/contract-token-values/contract-token-values.js
@@ -25,7 +25,7 @@ export default function ContractTokenValues({
   address,
   tokenName,
   chainId,
-  rpcPrefs,
+  blockExplorerUrl,
 }) {
   const t = useI18nContext();
   const [copied, handleCopy] = useCopyToClipboard();
@@ -69,7 +69,7 @@ export default function ContractTokenValues({
               address,
               chainId,
               {
-                blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+                blockExplorerUrl: blockExplorerUrl ?? null,
               },
               null,
             );
@@ -98,7 +98,7 @@ ContractTokenValues.propTypes = {
    */
   chainId: PropTypes.string,
   /**
-   * RPC prefs
+   * URL for the block explorer
    */
-  rpcPrefs: PropTypes.object,
+  blockExplorerUrl: PropTypes.string,
 };
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
index f77774c6ec4a..5f2e1dcbfd16 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
@@ -6,10 +6,10 @@ import {
 } from '@metamask/transaction-controller';
 import { BigNumber } from 'bignumber.js';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import { getConversionRate } from '../../../../ducks/metamask/metamask';
 import { getTokenStandardAndDetails } from '../../../../store/actions';
 import { fetchTokenExchangeRates } from '../../../../helpers/utils/util';
 import { memoizedGetTokenStandardAndDetails } from '../../utils/token';
+import { selectConversionRateByChainId } from '../../../../selectors';
 import { useBalanceChanges } from './useBalanceChanges';
 import { FIAT_UNAVAILABLE } from './types';
 
@@ -17,13 +17,10 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn((selector) => selector()),
 }));
 
-jest.mock('../../../../ducks/metamask/metamask', () => ({
-  getConversionRate: jest.fn(),
-}));
-
 jest.mock('../../../../selectors', () => ({
   getCurrentChainId: jest.fn(),
   getCurrentCurrency: jest.fn(),
+  selectConversionRateByChainId: jest.fn(),
 }));
 
 jest.mock('../../../../helpers/utils/util', () => ({
@@ -34,7 +31,9 @@ jest.mock('../../../../store/actions', () => ({
   getTokenStandardAndDetails: jest.fn(),
 }));
 
-const mockGetConversionRate = getConversionRate as jest.Mock;
+const mockSelectConversionRateByChainId = jest.mocked(
+  selectConversionRateByChainId,
+);
 const mockGetTokenStandardAndDetails = getTokenStandardAndDetails as jest.Mock;
 const mockFetchTokenExchangeRates = fetchTokenExchangeRates as jest.Mock;
 
@@ -85,7 +84,7 @@ describe('useBalanceChanges', () => {
       }
       return Promise.reject(new Error('Unable to determine token standard'));
     });
-    mockGetConversionRate.mockReturnValue(ETH_TO_FIAT_RATE);
+    mockSelectConversionRateByChainId.mockReturnValue(ETH_TO_FIAT_RATE);
     mockFetchTokenExchangeRates.mockResolvedValue({
       [ERC20_TOKEN_ADDRESS_1_MOCK]: ERC20_TO_FIAT_RATE_1_MOCK,
       [ERC20_TOKEN_ADDRESS_2_MOCK]: ERC20_TO_FIAT_RATE_2_MOCK,
@@ -344,7 +343,7 @@ describe('useBalanceChanges', () => {
     });
 
     it('handles native fiat rate with more than 15 significant digits', async () => {
-      mockGetConversionRate.mockReturnValue(0.1234567890123456);
+      mockSelectConversionRateByChainId.mockReturnValue(0.1234567890123456);
       const { result, waitForNextUpdate } = setupHook({
         ...dummyBalanceChange,
         difference: DIFFERENCE_ETH_MOCK,
@@ -357,7 +356,7 @@ describe('useBalanceChanges', () => {
     });
 
     it('handles unavailable native fiat rate', async () => {
-      mockGetConversionRate.mockReturnValue(null);
+      mockSelectConversionRateByChainId.mockReturnValue(null);
       const { result, waitForNextUpdate } = setupHook({
         ...dummyBalanceChange,
         difference: DIFFERENCE_ETH_MOCK,
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
index 1bbc9cb5eec8..666682c95c76 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
@@ -10,8 +10,10 @@ import { BigNumber } from 'bignumber.js';
 import { ContractExchangeRates } from '@metamask/assets-controllers';
 import { useAsyncResultOrThrow } from '../../../../hooks/useAsyncResult';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import { getConversionRate } from '../../../../ducks/metamask/metamask';
-import { getCurrentCurrency } from '../../../../selectors';
+import {
+  getCurrentCurrency,
+  selectConversionRateByChainId,
+} from '../../../../selectors';
 import { fetchTokenExchangeRates } from '../../../../helpers/utils/util';
 import { ERC20_DEFAULT_DECIMALS, fetchErc20Decimals } from '../../utils/token';
 
@@ -158,7 +160,10 @@ export const useBalanceChanges = ({
   simulationData?: SimulationData;
 }): { pending: boolean; value: BalanceChange[] } => {
   const fiatCurrency = useSelector(getCurrentCurrency);
-  const nativeFiatRate = useSelector(getConversionRate);
+
+  const nativeFiatRate = useSelector((state) =>
+    selectConversionRateByChainId(state, chainId),
+  );
 
   const { nativeBalanceChange, tokenBalanceChanges = [] } =
     simulationData ?? {};
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
index a641ecbab93a..5127003a81e8 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.js
@@ -14,7 +14,10 @@ import {
 } from '../../../../components/component-library';
 import SimulationErrorMessage from '../simulation-error-message';
 import { SEVERITIES } from '../../../../helpers/constants/design-system';
+// eslint-disable-next-line import/no-duplicates
+import { selectNetworkConfigurationByChainId } from '../../../../selectors';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+// eslint-disable-next-line import/no-duplicates
 import { submittedPendingTransactionsSelector } from '../../../../selectors';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 ///: END:ONLY_INCLUDE_IF
@@ -22,7 +25,6 @@ import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils';
 import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
 import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message';
-import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import { parseStandardTokenTransactionData } from '../../../../../shared/modules/transaction.utils';
 import { getTokenValueParam } from '../../../../../shared/lib/metamask-controller-utils';
 import { QueuedRequestsBannerAlert } from '../../confirmation/components/queued-requests-banner-alert';
@@ -47,7 +49,12 @@ const TransactionAlerts = ({
   ///: END:ONLY_INCLUDE_IF
 
   const t = useI18nContext();
-  const nativeCurrency = useSelector(getNativeCurrency);
+  const { chainId } = txData;
+
+  const { nativeCurrency } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
   const transactionData = txData.txParams.data;
   const currentTokenSymbol = tokenSymbol || nativeCurrency;
   let currentTokenAmount;
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
index ae46a4a83903..99a60a94e25d 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.stories.js
@@ -10,6 +10,8 @@ import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { mockNetworkState } from '../../../../../test/stub/networks';
 import TransactionAlerts from '.';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
 const mockSelectedInternalAccount =
   getSelectedInternalAccountFromMockState(testData);
 
@@ -24,7 +26,7 @@ const customTransaction = ({
     userFeeLevel: estimateUsed ? 'low' : 'medium',
     blockNumber: `${10902987 + i}`,
     id: 4678200543090545 + i,
-    chainId: '0x1',
+    chainId: CHAIN_ID_MOCK,
     status: 'confirmed',
     time: 1600654021000,
     txParams: {
@@ -48,23 +50,14 @@ const customTransaction = ({
 };
 
 // simulate gas fee state
-const customStore = ({
-  supportsEIP1559,
-  isNetworkBusy,
-  pendingCount = 0,
-} = {}) => {
+const customStore = ({ supportsEIP1559, pendingCount = 0 } = {}) => {
   const data = cloneDeep({
     ...testData,
     metamask: {
       ...testData?.metamask,
-      // isNetworkBusy
-      gasFeeEstimates: {
-        ...testData?.metamask?.gasFeeEstimates,
-        networkCongestion: isNetworkBusy ? 1 : 0.1,
-      },
       // supportsEIP1559
       ...mockNetworkState({
-        chainId: CHAIN_IDS.MAINNET,
+        chainId: CHAIN_ID_MOCK,
         metadata: {
           EIPS: {
             1559: Boolean(supportsEIP1559),
@@ -75,15 +68,12 @@ const customStore = ({
       featureFlags: {
         ...testData?.metamask?.featureFlags,
       },
-      incomingTransactions: {
-        ...testData?.metamask?.incomingTransactions,
-        ...Object.fromEntries(
-          Array.from({ length: pendingCount }).map((_, i) => {
-            const transaction = customTransaction({ i, status: 'submitted' });
-            return [transaction?.hash, transaction];
-          }),
+      transactions: [
+        ...testData.metamask.transactions,
+        ...Array.from({ length: pendingCount }).map((_, i) =>
+          customTransaction({ i, status: 'submitted' }),
         ),
-      },
+      ],
     },
   });
   return configureStore(data);
@@ -99,6 +89,7 @@ export default {
   args: {
     userAcknowledgedGasMissing: false,
     txData: {
+      chainId: CHAIN_ID_MOCK,
       txParams: {
         value: '0x1',
       },
@@ -129,6 +120,7 @@ DefaultStory.storyName = 'Default';
 DefaultStory.args = {
   ...DefaultStory.args,
   txData: {
+    chainId: CHAIN_ID_MOCK,
     txParams: {
       value: '0x0',
     },
@@ -176,15 +168,6 @@ export const LowPriority = (args) => (
 );
 LowPriority.storyName = 'LowPriority';
 
-export const BusyNetwork = (args) => (
-  <Provider store={customStore({ isNetworkBusy: true })}>
-    <GasFeeContextProvider transaction={customTransaction()}>
-      <TransactionAlerts {...args} />
-    </GasFeeContextProvider>
-  </Provider>
-);
-BusyNetwork.storyName = 'BusyNetwork';
-
 export const SendingZeroAmount = (args) => (
   <Provider store={customStore()}>
     <GasFeeContextProvider transaction={customTransaction()}>
@@ -195,6 +178,7 @@ export const SendingZeroAmount = (args) => (
 SendingZeroAmount.storyName = 'SendingZeroAmount';
 SendingZeroAmount.args = {
   txData: {
+    chainId: CHAIN_ID_MOCK,
     txParams: {
       value: '0x0',
     },
diff --git a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
index 6ae1a59591dd..4695120fbae7 100644
--- a/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
+++ b/ui/pages/confirmations/components/transaction-alerts/transaction-alerts.test.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
 import sinon from 'sinon';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../../shared/constants/security-provider';
 import { renderWithProvider } from '../../../../../test/jest';
 import { submittedPendingTransactionsSelector } from '../../../../selectors/transactions';
@@ -9,6 +10,7 @@ import configureStore from '../../../../store/store';
 import mockState from '../../../../../test/data/mock-state.json';
 import * as txUtil from '../../../../../shared/modules/transaction.utils';
 import * as metamaskControllerUtils from '../../../../../shared/lib/metamask-controller-utils';
+import { mockNetworkState } from '../../../../../test/stub/networks';
 import TransactionAlerts from './transaction-alerts';
 
 jest.mock('../../../../selectors/transactions', () => {
@@ -22,17 +24,28 @@ jest.mock('../../../../contexts/gasFee');
 
 jest.mock('../../../../selectors/account-abstraction');
 
+const CHAIN_ID_MOCK = CHAIN_IDS.MAINNET;
+
+const STATE_MOCK = {
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    ...mockNetworkState({
+      chainId: CHAIN_ID_MOCK,
+    }),
+  },
+};
+
 function render({
   componentProps = {},
   useGasFeeContextValue = {},
   submittedPendingTransactionsSelectorValue = null,
-  mockedStore = mockState,
 }) {
   useGasFeeContext.mockReturnValue(useGasFeeContextValue);
   submittedPendingTransactionsSelector.mockReturnValue(
     submittedPendingTransactionsSelectorValue,
   );
-  const store = configureStore(mockedStore);
+  const store = configureStore(STATE_MOCK);
   return renderWithProvider(<TransactionAlerts {...componentProps} />, store);
 }
 
@@ -41,6 +54,7 @@ describe('TransactionAlerts', () => {
     const { getByText } = render({
       componentProps: {
         txData: {
+          chainId: CHAIN_ID_MOCK,
           securityAlertResponse: {
             resultType: 'Malicious',
             reason: 'blur_farming',
@@ -64,6 +78,7 @@ describe('TransactionAlerts', () => {
     const { queryByText } = render({
       componentProps: {
         txData: {
+          chainId: CHAIN_ID_MOCK,
           securityProviderResponse: {
             flagAsDangerous: '?',
             reason: 'Some reason...',
@@ -89,6 +104,7 @@ describe('TransactionAlerts', () => {
     const { queryByText } = render({
       componentProps: {
         txData: {
+          chainId: CHAIN_ID_MOCK,
           securityProviderResponse: {
             flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS,
           },
@@ -118,6 +134,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -141,6 +158,7 @@ describe('TransactionAlerts', () => {
             },
             componentProps: {
               txData: {
+                chainId: CHAIN_ID_MOCK,
                 txParams: {
                   value: '0x1',
                 },
@@ -160,6 +178,7 @@ describe('TransactionAlerts', () => {
             componentProps: {
               setUserAcknowledgedGasMissing,
               txData: {
+                chainId: CHAIN_ID_MOCK,
                 txParams: {
                   value: '0x1',
                 },
@@ -181,6 +200,7 @@ describe('TransactionAlerts', () => {
             componentProps: {
               userAcknowledgedGasMissing: true,
               txData: {
+                chainId: CHAIN_ID_MOCK,
                 txParams: {
                   value: '0x1',
                 },
@@ -199,6 +219,7 @@ describe('TransactionAlerts', () => {
         const { queryByText } = render({
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -220,6 +241,7 @@ describe('TransactionAlerts', () => {
           submittedPendingTransactionsSelectorValue: [{ some: 'transaction' }],
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -242,6 +264,7 @@ describe('TransactionAlerts', () => {
           ],
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -261,6 +284,7 @@ describe('TransactionAlerts', () => {
           submittedPendingTransactionsSelectorValue: [],
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -282,6 +306,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -301,6 +326,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -322,6 +348,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -345,6 +372,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -367,6 +395,7 @@ describe('TransactionAlerts', () => {
           submittedPendingTransactionsSelectorValue: [{ some: 'transaction' }],
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -388,6 +417,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -407,6 +437,7 @@ describe('TransactionAlerts', () => {
           },
           componentProps: {
             txData: {
+              chainId: CHAIN_ID_MOCK,
               txParams: {
                 value: '0x1',
               },
@@ -445,6 +476,7 @@ describe('TransactionAlerts', () => {
       const { getByText } = render({
         componentProps: {
           txData: {
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               value: '0x0',
             },
@@ -461,6 +493,7 @@ describe('TransactionAlerts', () => {
       const { getByText } = render({
         componentProps: {
           txData: {
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               value: '0x0',
             },
@@ -478,6 +511,7 @@ describe('TransactionAlerts', () => {
       const { queryByText } = render({
         componentProps: {
           txData: {
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               value: '0x5af3107a4000',
             },
@@ -492,6 +526,7 @@ describe('TransactionAlerts', () => {
       const { queryByText } = render({
         componentProps: {
           txData: {
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               value: '0x0',
             },
@@ -508,6 +543,7 @@ describe('TransactionAlerts', () => {
       const { getByText } = render({
         componentProps: {
           txData: {
+            chainId: CHAIN_ID_MOCK,
             txParams: {
               value: '0x1',
             },
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index ebd57c35a141..007aec372c62 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -70,7 +70,7 @@ export default class ConfirmApproveContent extends Component {
     fromAddressIsLedger: PropTypes.bool,
     chainId: PropTypes.string,
     tokenAddress: PropTypes.string,
-    rpcPrefs: PropTypes.object,
+    blockExplorerUrl: PropTypes.string,
     isContract: PropTypes.bool,
     hexTransactionTotal: PropTypes.string,
     hexMinimumTransactionFee: PropTypes.string,
@@ -375,10 +375,10 @@ export default class ConfirmApproveContent extends Component {
   }
 
   getTitleTokenDescription() {
-    const { tokenId, tokenAddress, rpcPrefs, chainId, userAddress } =
+    const { tokenId, tokenAddress, blockExplorerUrl, chainId, userAddress } =
       this.props;
     const useBlockExplorer =
-      rpcPrefs?.blockExplorerUrl ||
+      blockExplorerUrl ||
       [...TEST_CHAINS, CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET].includes(
         chainId,
       );
@@ -393,7 +393,7 @@ export default class ConfirmApproveContent extends Component {
         null,
         userAddress,
         {
-          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+          blockExplorerUrl: blockExplorerUrl ?? null,
         },
       );
       const blockExplorerElement = (
@@ -529,7 +529,7 @@ export default class ConfirmApproveContent extends Component {
       fromAddressIsLedger,
       toAddress,
       chainId,
-      rpcPrefs,
+      blockExplorerUrl,
       assetStandard,
       tokenId,
       tokenAddress,
@@ -612,7 +612,7 @@ export default class ConfirmApproveContent extends Component {
               tokenAddress={tokenAddress}
               toAddress={toAddress}
               chainId={chainId}
-              rpcPrefs={rpcPrefs}
+              blockExplorerUrl={blockExplorerUrl}
               tokenId={tokenId}
               assetName={assetName}
               assetStandard={assetStandard}
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.js b/ui/pages/confirmations/confirm-approve/confirm-approve.js
index 1b604ec43e6b..e167c15196ba 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.js
@@ -12,10 +12,7 @@ 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 {
-  getNativeCurrency,
-  isAddressLedger,
-} from '../../../ducks/metamask/metamask';
+import { isAddressLedger } from '../../../ducks/metamask/metamask';
 import ConfirmContractInteraction from '../confirm-contract-interaction';
 import {
   getCurrentCurrency,
@@ -23,10 +20,9 @@ import {
   getUseNonceField,
   getCustomNonceValue,
   getNextSuggestedNonce,
-  getCurrentChainId,
-  getRpcPrefsForCurrentProvider,
   checkNetworkAndAccountSupports1559,
   getUseCurrencyRateCheck,
+  selectNetworkConfigurationByChainId,
 } from '../../../selectors';
 import { useApproveTransaction } from '../hooks/useApproveTransaction';
 import { useSimulationFailureWarning } from '../hooks/useSimulationFailureWarning';
@@ -66,16 +62,23 @@ export default function ConfirmApprove({
   isSetApproveForAll,
 }) {
   const dispatch = useDispatch();
-  const { txParams: { data: transactionData, from } = {} } = transaction;
+  const { chainId, txParams: { data: transactionData, from } = {} } =
+    transaction;
 
   const currentCurrency = useSelector(getCurrentCurrency);
-  const nativeCurrency = useSelector(getNativeCurrency);
+
+  const { nativeCurrency } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
   const subjectMetadata = useSelector(getSubjectMetadata);
   const useNonceField = useSelector(getUseNonceField);
   const nextNonce = useSelector(getNextSuggestedNonce);
   const customNonceValue = useSelector(getCustomNonceValue);
-  const chainId = useSelector(getCurrentChainId);
-  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const { blockExplorerUrls } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+  const blockExplorerUrl = blockExplorerUrls?.[0];
   const networkAndAccountSupports1559 = useSelector(
     checkNetworkAndAccountSupports1559,
   );
@@ -291,7 +294,7 @@ export default function ConfirmApprove({
               txData={transaction}
               fromAddressIsLedger={fromAddressIsLedger}
               chainId={chainId}
-              rpcPrefs={rpcPrefs}
+              blockExplorerUrl={blockExplorerUrl}
               isContract={isContract}
               hasLayer1GasFee={layer1GasFee !== undefined}
               supportsEIP1559={supportsEIP1559}
@@ -334,6 +337,7 @@ ConfirmApprove.propTypes = {
   userAddress: PropTypes.string,
   toAddress: PropTypes.string,
   transaction: PropTypes.shape({
+    chainId: PropTypes.string,
     layer1GasFee: PropTypes.string,
     origin: PropTypes.string,
     txParams: PropTypes.shape({
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 3e24c72541d5..4e68783e9be7 100644
--- a/ui/pages/confirmations/confirm-send-token/confirm-send-token.js
+++ b/ui/pages/confirmations/confirm-send-token/confirm-send-token.js
@@ -8,11 +8,9 @@ import { editExistingTransaction } from '../../../ducks/send';
 import {
   contractExchangeRateSelector,
   getCurrentCurrency,
+  selectConversionRateByChainId,
+  selectNetworkConfigurationByChainId,
 } from '../../../selectors';
-import {
-  getConversionRate,
-  getNativeCurrency,
-} from '../../../ducks/metamask/metamask';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../../store/actions';
 import {
@@ -49,8 +47,17 @@ export default function ConfirmSendToken({
       history.push(SEND_ROUTE);
     });
   };
-  const conversionRate = useSelector(getConversionRate);
-  const nativeCurrency = useSelector(getNativeCurrency);
+
+  const { chainId } = transaction;
+
+  const conversionRate = useSelector((state) =>
+    selectConversionRateByChainId(state, chainId),
+  );
+
+  const { nativeCurrency } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
   const currentCurrency = useSelector(getCurrentCurrency);
   const contractExchangeRate = useSelector(contractExchangeRateSelector);
 
@@ -98,6 +105,7 @@ ConfirmSendToken.propTypes = {
   toAddress: PropTypes.string,
   tokenAddress: PropTypes.string,
   transaction: PropTypes.shape({
+    chainId: PropTypes.string,
     origin: PropTypes.string,
     txParams: PropTypes.shape({
       data: PropTypes.string,
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 7b60bf9ab4fe..077d5c757dcb 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,16 +15,12 @@ import {
 import { PRIMARY } from '../../../helpers/constants/common';
 import {
   contractExchangeRateSelector,
-  getCurrentChainId,
   getCurrentCurrency,
-  getRpcPrefsForCurrentProvider,
   getSelectedInternalAccount,
+  selectConversionRateByChainId,
+  selectNetworkConfigurationByChainId,
+  selectNftContractsByChainId,
 } from '../../../selectors';
-import {
-  getConversionRate,
-  getNativeCurrency,
-  getNftContracts,
-} from '../../../ducks/metamask/metamask';
 import { TokenStandard } from '../../../../shared/constants/transaction';
 import {
   getWeiHexFromDecimalValue,
@@ -47,16 +43,28 @@ export default function ConfirmTokenTransactionBase({
   ethTransactionTotal,
   fiatTransactionTotal,
   hexMaximumTransactionFee,
+  transaction,
 }) {
   const t = useContext(I18nContext);
   const contractExchangeRate = useSelector(contractExchangeRateSelector);
-  const nativeCurrency = useSelector(getNativeCurrency);
+  const { chainId } = transaction;
+
+  const { blockExplorerUrls, nativeCurrency } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
+  const blockExplorerUrl = blockExplorerUrls?.[0];
   const currentCurrency = useSelector(getCurrentCurrency);
-  const conversionRate = useSelector(getConversionRate);
-  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const chainId = useSelector(getCurrentChainId);
+
+  const conversionRate = useSelector((state) =>
+    selectConversionRateByChainId(state, chainId),
+  );
+
   const { address: userAddress } = useSelector(getSelectedInternalAccount);
-  const nftCollections = useSelector(getNftContracts);
+
+  const nftCollections = useSelector((state) =>
+    selectNftContractsByChainId(state, chainId),
+  );
 
   const ethTransactionTotalMaxAmount = Number(
     hexWEIToDecETH(hexMaximumTransactionFee),
@@ -64,7 +72,7 @@ export default function ConfirmTokenTransactionBase({
 
   const getTitleTokenDescription = (renderType) => {
     const useBlockExplorer =
-      rpcPrefs?.blockExplorerUrl ||
+      blockExplorerUrl ||
       [...TEST_CHAINS, CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET].includes(
         chainId,
       );
@@ -87,7 +95,7 @@ export default function ConfirmTokenTransactionBase({
         null,
         userAddress,
         {
-          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+          blockExplorerUrl: blockExplorerUrl ?? null,
         },
       );
       const blockExplorerElement = (
@@ -219,4 +227,5 @@ ConfirmTokenTransactionBase.propTypes = {
   ethTransactionTotal: PropTypes.string,
   fiatTransactionTotal: PropTypes.string,
   hexMaximumTransactionFee: PropTypes.string,
+  transaction: PropTypes.string,
 };
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index 25d99e8a9f16..bcc3279752e2 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -1015,24 +1015,15 @@ export default class ConfirmTransactionBase extends Component {
     const {
       toAddress,
       fromAddress,
-      txData: { origin, chainId: txChainId } = {},
+      txData: { origin } = {},
       getNextNonce,
       tryReverseResolveAddress,
       smartTransactionsPreferenceEnabled,
       currentChainSupportsSmartTransactions,
       setSwapsFeatureFlags,
       fetchSmartTransactionsLiveness,
-      chainId,
     } = this.props;
 
-    // If the user somehow finds themselves seeing a confirmation
-    // on a network which is not presently selected, throw
-    if (txChainId === undefined || txChainId !== chainId) {
-      throw new Error(
-        `Currently selected chainId (${chainId}) does not match chainId (${txChainId}) on which the transaction was proposed.`,
-      );
-    }
-
     const { trackEvent } = this.context;
     trackEvent({
       category: MetaMetricsEventCategory.Transactions,
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
index 795dfae0c63a..c34025e2f0c5 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js
@@ -69,11 +69,8 @@ import {
   isAddressLedger,
   updateGasFees,
   getIsGasEstimatesLoading,
-  getNativeCurrency,
   getSendToAccounts,
-  getProviderConfig,
   findKeyringForAddress,
-  getConversionRate,
 } from '../../../ducks/metamask/metamask';
 import {
   addHexPrefix,
@@ -97,10 +94,19 @@ import { CUSTOM_GAS_ESTIMATE } from '../../../../shared/constants/gas';
 // eslint-disable-next-line import/no-duplicates
 import { getIsUsingPaymaster } from '../../../selectors/account-abstraction';
 
+import {
+  selectConversionRateByChainId,
+  selectNetworkConfigurationByChainId,
+  // eslint-disable-next-line import/no-duplicates
+} from '../../../selectors/selectors';
+
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+import {
+  getAccountType,
+  selectDefaultRpcEndpointByChainId,
+  // eslint-disable-next-line import/no-duplicates
+} from '../../../selectors/selectors';
 // eslint-disable-next-line import/no-duplicates
-import { getAccountType } from '../../../selectors/selectors';
-
 import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../shared/constants/app';
 import {
   getIsNoteToTraderSupported,
@@ -168,15 +174,16 @@ const mapStateToProps = (state, ownProps) => {
   const gasLoadingAnimationIsShowing = getGasLoadingAnimationIsShowing(state);
   const isBuyableChain = getIsNativeTokenBuyable(state);
   const { confirmTransaction, metamask } = state;
-  const conversionRate = getConversionRate(state);
   const { addressBook, nextNonce } = metamask;
   const unapprovedTxs = getUnapprovedTransactions(state);
 
-  const { chainId } = getProviderConfig(state);
   const { tokenData, txData, tokenProps, nonce } = confirmTransaction;
   const { txParams = {}, id: transactionId, type } = txData;
   const txId = transactionId || paramsTransactionId;
   const transaction = getUnapprovedTransaction(state, txId) ?? {};
+  const { chainId } = transaction;
+  const conversionRate = selectConversionRateByChainId(state, chainId);
+
   const {
     from: fromAddress,
     to: txParamsToAddress,
@@ -184,6 +191,7 @@ const mapStateToProps = (state, ownProps) => {
     gas: gasLimit,
     data,
   } = (transaction && transaction.txParams) || txParams;
+
   const accounts = getMetaMaskAccounts(state);
   const smartTransactionsPreferenceEnabled =
     getSmartTransactionsPreferenceEnabled(state);
@@ -270,7 +278,10 @@ const mapStateToProps = (state, ownProps) => {
     fullTxData.userFeeLevel === CUSTOM_GAS_ESTIMATE ||
     txParamsAreDappSuggested(fullTxData);
   const fromAddressIsLedger = isAddressLedger(state, fromAddress);
-  const nativeCurrency = getNativeCurrency(state);
+
+  const { nativeCurrency } =
+    selectNetworkConfigurationByChainId(state, chainId) ?? {};
+
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const accountType = getAccountType(state, fromAddress);
   const fromChecksumHexAddress = toChecksumHexAddress(fromAddress);
@@ -281,7 +292,9 @@ const mapStateToProps = (state, ownProps) => {
   const custodianPublishesTransaction =
     getIsCustodianPublishesTransactionSupported(state, fromChecksumHexAddress);
   const builtinRpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
-  const { rpcUrl: customRpcUrl } = getProviderConfig(state);
+
+  const { url: customRpcUrl } =
+    selectDefaultRpcEndpointByChainId(state, chainId) ?? {};
 
   const rpcUrl = customRpcUrl || builtinRpcUrl;
 
diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
index bea6aef1d84d..5a846874fed3 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.test.js
@@ -969,45 +969,4 @@ describe('Confirm Transaction Base', () => {
       expect(confirmButton).toBeDisabled();
     });
   });
-
-  describe('Preventing transaction submission', () => {
-    it('should throw error when on wrong chain', async () => {
-      const txParams = {
-        ...mockTxParams,
-        to: undefined,
-        data: '0xa22cb46500000000000000',
-        chainId: '0x5',
-      };
-      const state = {
-        ...baseStore,
-        metamask: {
-          ...baseStore.metamask,
-          transactions: [
-            {
-              id: baseStore.confirmTransaction.txData.id,
-              chainId: '0x5',
-              status: 'unapproved',
-              txParams,
-            },
-          ],
-          ...mockNetworkState({ chainId: CHAIN_IDS.SEPOLIA }),
-        },
-        confirmTransaction: {
-          ...baseStore.confirmTransaction,
-          txData: {
-            ...baseStore.confirmTransaction.txData,
-            value: '0x0',
-            isUserOperation: true,
-            txParams,
-            chainId: '0x5',
-          },
-        },
-      };
-
-      // Error will be triggered by componentDidMount
-      await expect(render({ state })).rejects.toThrow(
-        'Currently selected chainId (0xaa36a7) does not match chainId (0x5) on which the transaction was proposed.',
-      );
-    });
-  });
 });
diff --git a/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js b/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
index 1bf5c8771b4f..72f570c5b98b 100644
--- a/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
+++ b/ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
@@ -27,6 +27,7 @@ import { useAssetDetails } from '../hooks/useAssetDetails';
 
 export default function ConfirmTokenTransactionSwitch({ transaction }) {
   const {
+    chainId,
     txParams: { data, to: tokenAddress, from: userAddress } = {},
     layer1GasFee,
   } = transaction;
@@ -44,7 +45,7 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
     tokenAmount,
     tokenId,
     toAddress,
-  } = useAssetDetails(tokenAddress, userAddress, data);
+  } = useAssetDetails(tokenAddress, userAddress, data, chainId);
 
   const {
     ethTransactionTotal,
@@ -221,6 +222,7 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
 
 ConfirmTokenTransactionSwitch.propTypes = {
   transaction: PropTypes.shape({
+    chainId: PropTypes.string,
     origin: PropTypes.string,
     txParams: PropTypes.shape({
       data: PropTypes.string,
diff --git a/ui/pages/confirmations/confirm/stories/transactions/contract-interaction.stories.tsx b/ui/pages/confirmations/confirm/stories/transactions/contract-interaction.stories.tsx
index 33a8c2e67f0b..5a531a97787d 100644
--- a/ui/pages/confirmations/confirm/stories/transactions/contract-interaction.stories.tsx
+++ b/ui/pages/confirmations/confirm/stories/transactions/contract-interaction.stories.tsx
@@ -39,15 +39,16 @@ export const UserOperationStory = () => {
   };
 
   const confirmState = getMockConfirmStateForTransaction(confirmation, {
-    metamask: {},
-    preferences: {
-      ...mockState.metamask.preferences,
-      petnamesEnabled: true,
-    },
-    userOperations: {
-      [confirmation.id]: {
-        userOperation: {
-          paymasterAndData: PAYMASTER_AND_DATA,
+    metamask: {
+      preferences: {
+        ...mockState.metamask.preferences,
+        petnamesEnabled: true,
+      },
+      userOperations: {
+        [confirmation.id]: {
+          userOperation: {
+            paymasterAndData: PAYMASTER_AND_DATA,
+          },
         },
       },
     },
diff --git a/ui/pages/confirmations/confirm/stories/utils.tsx b/ui/pages/confirmations/confirm/stories/utils.tsx
index 9c68a392cbd7..18f9ae734e31 100644
--- a/ui/pages/confirmations/confirm/stories/utils.tsx
+++ b/ui/pages/confirmations/confirm/stories/utils.tsx
@@ -1,17 +1,11 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { MemoryRouter, Route } from 'react-router-dom';
 import configureStore from '../../../../store/store';
-import { ConfirmContextProvider } from '../../context/confirm';
 import ConfirmPage from '../confirm';
 
 export const CONFIRM_PAGE_DECORATOR = [
   (story: () => React.ReactFragment) => {
-    return (
-      <ConfirmContextProvider>
-        <div style={{ height: '600px' }}>{story()}</div>
-      </ConfirmContextProvider>
-    );
+    return <div style={{ height: '600px' }}>{story()}</div>;
   },
 ];
 
@@ -36,18 +30,7 @@ export function ConfirmStoryTemplate(
 
   return (
     <Provider store={store}>
-      {/* Adding the MemoryRouter and Route is a workaround to bypass a 404 error in storybook that
-        is caused when the 'ui/pages/confirmations/hooks/syncConfirmPath.ts' hook calls
-        history.replace. To avoid history.replace, we can provide a param id. */}
-      <MemoryRouter
-        initialEntries={[
-          `/confirmation/${
-            Object.keys(metamaskState.metamask?.pendingApprovals)?.[0]
-          }`,
-        ]}
-      >
-        <Route path="/confirmation/:id" element={<ConfirmPage />} />
-      </MemoryRouter>
+      <ConfirmPage />
     </Provider>
   );
 }
diff --git a/ui/pages/confirmations/hooks/test-utils.js b/ui/pages/confirmations/hooks/test-utils.js
index 908f600564f8..5e327b0467c5 100644
--- a/ui/pages/confirmations/hooks/test-utils.js
+++ b/ui/pages/confirmations/hooks/test-utils.js
@@ -3,10 +3,6 @@ import { useSelector } from 'react-redux';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 
 import { GasEstimateTypes } from '../../../../shared/constants/gas';
-import {
-  getConversionRate,
-  getNativeCurrency,
-} from '../../../ducks/metamask/metamask';
 import {
   getCurrentCurrency,
   getShouldShowFiat,
@@ -14,6 +10,7 @@ import {
   getCurrentKeyring,
   getTokenExchangeRates,
   getPreferences,
+  selectConversionRateByChainId,
 } from '../../../selectors';
 
 import {
@@ -107,13 +104,10 @@ export const generateUseSelectorRouter =
     if (selector === getMultichainIsEvm) {
       return true;
     }
-    if (selector === getConversionRate) {
+    if (selector === selectConversionRateByChainId) {
       return MOCK_ETH_USD_CONVERSION_RATE;
     }
-    if (
-      selector === getMultichainNativeCurrency ||
-      selector === getNativeCurrency
-    ) {
+    if (selector === getMultichainNativeCurrency) {
       return EtherDenomination.ETH;
     }
     if (selector === getPreferences) {
diff --git a/ui/pages/confirmations/hooks/useAssetDetails.js b/ui/pages/confirmations/hooks/useAssetDetails.js
index 4a9afaf05468..bea2f6da89a8 100644
--- a/ui/pages/confirmations/hooks/useAssetDetails.js
+++ b/ui/pages/confirmations/hooks/useAssetDetails.js
@@ -1,7 +1,7 @@
 import { isEqual } from 'lodash';
 import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { getNfts, getTokens } from '../../../ducks/metamask/metamask';
+import { getTokens } from '../../../ducks/metamask/metamask';
 import { getAssetDetails } from '../../../helpers/utils/token-util';
 import {
   hideLoadingIndication,
@@ -10,11 +10,18 @@ import {
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
+import { selectNftsByChainId } from '../../../selectors';
 
-export function useAssetDetails(tokenAddress, userAddress, transactionData) {
+export function useAssetDetails(
+  tokenAddress,
+  userAddress,
+  transactionData,
+  chainId,
+) {
   const dispatch = useDispatch();
+
   // state selectors
-  const nfts = useSelector(getNfts);
+  const nfts = useSelector((state) => selectNftsByChainId(state, chainId));
   const tokens = useSelector(getTokens, isEqual);
   const currentToken = tokens.find((token) =>
     isEqualCaseInsensitive(token.address, tokenAddress),
diff --git a/ui/pages/confirmations/hooks/useTransactionFunctionType.js b/ui/pages/confirmations/hooks/useTransactionFunctionType.js
index 559367fff066..10255149eda7 100644
--- a/ui/pages/confirmations/hooks/useTransactionFunctionType.js
+++ b/ui/pages/confirmations/hooks/useTransactionFunctionType.js
@@ -2,8 +2,10 @@ import { useSelector } from 'react-redux';
 
 import { TransactionType } from '@metamask/transaction-controller';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-import { getKnownMethodData } from '../../../selectors';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import {
+  getKnownMethodData,
+  selectNetworkConfigurationByChainId,
+} from '../../../selectors';
 import { getTransactionTypeTitle } from '../../../helpers/utils/transactions.util';
 import { getMethodName } from '../../../helpers/utils/metrics';
 
@@ -11,8 +13,12 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 
 export const useTransactionFunctionType = (txData = {}) => {
   const t = useI18nContext();
-  const nativeCurrency = useSelector(getNativeCurrency);
-  const { txParams } = txData;
+  const { chainId, txParams } = txData;
+
+  const networkConfiguration = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
   const methodData = useSelector(
     (state) => getKnownMethodData(state, txParams?.data) || {},
   );
@@ -21,6 +27,8 @@ export const useTransactionFunctionType = (txData = {}) => {
     return {};
   }
 
+  const { nativeCurrency } = networkConfiguration ?? {};
+
   const isTokenApproval =
     txData.type === TransactionType.tokenMethodSetApprovalForAll ||
     txData.type === TransactionType.tokenMethodApprove ||
diff --git a/ui/pages/confirmations/hooks/useTransactionFunctionType.test.js b/ui/pages/confirmations/hooks/useTransactionFunctionType.test.js
index 2bdc008e05dd..da625ad68267 100644
--- a/ui/pages/confirmations/hooks/useTransactionFunctionType.test.js
+++ b/ui/pages/confirmations/hooks/useTransactionFunctionType.test.js
@@ -1,47 +1,64 @@
-import { TransactionType } from '@metamask/transaction-controller';
+import { CHAIN_IDS, TransactionType } from '@metamask/transaction-controller';
 import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
 import mockState from '../../../../test/data/mock-state.json';
+import { mockNetworkState } from '../../../../test/stub/networks';
 import { useTransactionFunctionType } from './useTransactionFunctionType';
 
+const CHAIN_ID_MOCK = CHAIN_IDS.GOERLI;
+
+const STATE_MOCK = {
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    ...mockNetworkState({ chainId: CHAIN_ID_MOCK }),
+  },
+};
+
 describe('useTransactionFunctionType', () => {
   it('should return functionType depending on transaction data if present', () => {
     const { result } = renderHookWithProvider(
       () =>
         useTransactionFunctionType({
+          chainId: CHAIN_ID_MOCK,
           txParams: {
             data: '0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170',
           },
           type: TransactionType.tokenMethodApprove,
         }),
-      mockState,
+      STATE_MOCK,
     );
     expect(result.current.functionType).toStrictEqual('Approve spend limit');
   });
+
   it('should return functionType depending on transaction type if method not present in transaction data', () => {
     const { result } = renderHookWithProvider(
       () =>
         useTransactionFunctionType({
+          chainId: CHAIN_ID_MOCK,
           txParams: {},
           type: TransactionType.tokenMethodTransfer,
         }),
-      mockState,
+      STATE_MOCK,
     );
     expect(result.current.functionType).toStrictEqual('Transfer');
   });
+
   it('should return functionType Contract interaction by default', () => {
     const { result } = renderHookWithProvider(
       () =>
         useTransactionFunctionType({
+          chainId: CHAIN_ID_MOCK,
           txParams: {},
         }),
-      mockState,
+      STATE_MOCK,
     );
     expect(result.current.functionType).toStrictEqual('Contract interaction');
   });
+
   it('should return undefined is txData is not present', () => {
     const { result } = renderHookWithProvider(
       () => useTransactionFunctionType(),
-      mockState,
+      STATE_MOCK,
     );
     expect(result.current.functionType).toBeUndefined();
   });
diff --git a/ui/pages/confirmations/hooks/useTransactionInfo.js b/ui/pages/confirmations/hooks/useTransactionInfo.js
index 452e44c83dfb..ef709de50486 100644
--- a/ui/pages/confirmations/hooks/useTransactionInfo.js
+++ b/ui/pages/confirmations/hooks/useTransactionInfo.js
@@ -1,5 +1,4 @@
 import { useSelector } from 'react-redux';
-import { getProviderConfig } from '../../../ducks/metamask/metamask';
 
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 import { getSelectedInternalAccount } from '../../../selectors';
@@ -7,7 +6,7 @@ import { getSelectedInternalAccount } from '../../../selectors';
 export const useTransactionInfo = (txData = {}) => {
   const { allNftContracts } = useSelector((state) => state.metamask);
   const selectedInternalAccount = useSelector(getSelectedInternalAccount);
-  const { chainId } = useSelector(getProviderConfig);
+  const { chainId } = txData;
 
   const isNftTransfer = Boolean(
     allNftContracts?.[selectedInternalAccount.address]?.[chainId]?.find(
diff --git a/ui/pages/confirmations/hooks/useTransactionInfo.test.js b/ui/pages/confirmations/hooks/useTransactionInfo.test.js
index 61ae036c4000..272c27abbfa4 100644
--- a/ui/pages/confirmations/hooks/useTransactionInfo.test.js
+++ b/ui/pages/confirmations/hooks/useTransactionInfo.test.js
@@ -1,7 +1,7 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
 import mockState from '../../../../test/data/mock-state.json';
 import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks';
-import { getCurrentChainId } from '../../../selectors';
 import { useTransactionInfo } from './useTransactionInfo';
 
 const mockSelectedInternalAccount =
@@ -13,22 +13,25 @@ describe('useTransactionInfo', () => {
       const { result } = renderHookWithProvider(
         () =>
           useTransactionInfo({
+            chainId: CHAIN_IDS.GOERLI,
             txParams: {},
           }),
         mockState,
       );
       expect(result.current.isNftTransfer).toStrictEqual(false);
     });
+
     it('should return true if transaction is NFT transfer', () => {
       mockState.metamask.allNftContracts = {
         [mockSelectedInternalAccount.address]: {
-          [getCurrentChainId(mockState)]: [{ address: '0x9' }],
+          [CHAIN_IDS.GOERLI]: [{ address: '0x9' }],
         },
       };
 
       const { result } = renderHookWithProvider(
         () =>
           useTransactionInfo({
+            chainId: CHAIN_IDS.GOERLI,
             txParams: {
               to: '0x9',
             },
diff --git a/ui/pages/confirmations/send/gas-display/gas-display.js b/ui/pages/confirmations/send/gas-display/gas-display.js
index 33a011c2966a..312854d168a7 100644
--- a/ui/pages/confirmations/send/gas-display/gas-display.js
+++ b/ui/pages/confirmations/send/gas-display/gas-display.js
@@ -27,14 +27,11 @@ import {
   getIsTestnet,
   getUseCurrencyRateCheck,
   getUnapprovedTransactions,
+  selectNetworkConfigurationByChainId,
 } from '../../../../selectors';
 
 import { INSUFFICIENT_TOKENS_ERROR } from '../send.constants';
 import { getCurrentDraftTransaction } from '../../../../ducks/send';
-import {
-  getNativeCurrency,
-  getProviderConfig,
-} from '../../../../ducks/metamask/metamask';
 import { showModal } from '../../../../store/actions';
 import {
   addHexes,
@@ -52,25 +49,26 @@ import { getIsNativeTokenBuyable } from '../../../../ducks/ramps';
 export default function GasDisplay({ gasError }) {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
-  const { estimateUsed } = useGasFeeContext();
+  const { estimateUsed, transaction } = useGasFeeContext();
+  const { chainId } = transaction;
   const trackEvent = useContext(MetaMetricsContext);
-
   const { openBuyCryptoInPdapp } = useRamps();
 
-  const providerConfig = useSelector(getProviderConfig);
+  const { name: networkNickname, nativeCurrency } = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, chainId),
+  );
+
   const isTestnet = useSelector(getIsTestnet);
   const isBuyableChain = useSelector(getIsNativeTokenBuyable);
   const draftTransaction = useSelector(getCurrentDraftTransaction);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const { showFiatInTestnets } = useSelector(getPreferences);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
-  const nativeCurrency = useSelector(getNativeCurrency);
-  const { chainId } = providerConfig;
   const networkName = NETWORK_TO_NAME_MAP[chainId];
   const isInsufficientTokenError =
     draftTransaction?.amount?.error === INSUFFICIENT_TOKENS_ERROR;
   const editingTransaction = unapprovedTxs[draftTransaction.id];
-  const currentNetworkName = networkName || providerConfig.nickname;
+  const currentNetworkName = networkName || networkNickname;
 
   const transactionData = {
     txParams: {
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 91ac3c735f84..bc44e728df86 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
@@ -148,14 +148,14 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
             </div>
           </div>
           <div
-            class="network-account-balance-header__network-account__ident-icon-ethereum--gray"
+            class="network-account-balance-header__network-account__ident-icon-ethereum"
             style="height: 16px; width: 16px;"
           >
-            <span
-              class="icon-with-fallback__fallback"
-            >
-              M
-            </span>
+            <img
+              alt="Ethereum Mainnet"
+              src="./images/eth_logo.svg"
+              style="height: 16px; width: 16px;"
+            />
           </div>
         </div>
         <div
@@ -165,7 +165,7 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
             data-testid="signature-request-network-display"
           >
-            mainnet
+            Ethereum Mainnet
           </h6>
           <h6
             class="mm-box mm-text mm-text--body-sm mm-text--font-weight-bold mm-box--color-text-default"
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.js b/ui/pages/confirmations/token-allowance/token-allowance.js
index 61bf5e0974df..d4e6f9d884d7 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.js
@@ -29,10 +29,8 @@ import { PageContainerFooter } from '../../../components/ui/page-container';
 import ContractDetailsModal from '../components/contract-details-modal/contract-details-modal';
 import {
   getCustomTokenAmount,
-  getNetworkIdentifier,
   transactionFeeSelector,
   getKnownMethodData,
-  getRpcPrefsForCurrentProvider,
   getUnapprovedTxCount,
   getUnapprovedTransactions,
   getUseCurrencyRateCheck,
@@ -77,7 +75,14 @@ import FeeDetailsComponent from '../components/fee-details-component/fee-details
 import { BlockaidResultType } from '../../../../shared/constants/security-provider';
 import { QueuedRequestsBannerAlert } from '../confirmation/components/queued-requests-banner-alert/queued-requests-banner-alert';
 
+import {
+  selectNetworkConfigurationByChainId,
+  selectNetworkIdentifierByChainId,
+  // eslint-disable-next-line import/no-duplicates
+} from '../../../selectors/selectors';
+
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+// eslint-disable-next-line import/no-duplicates
 import { getAccountType } from '../../../selectors/selectors';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
 import { showCustodyConfirmLink } from '../../../store/institutional/institution-actions';
@@ -142,8 +147,19 @@ export default function TokenAllowance({
   const fromAccount = useSelector((state) =>
     getTargetAccountWithSendEtherInfo(state, userAddress),
   );
-  const networkIdentifier = useSelector(getNetworkIdentifier);
-  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+
+  const { chainId } = txData;
+
+  const networkIdentifier = useSelector((state) =>
+    selectNetworkIdentifierByChainId(state, chainId),
+  );
+
+  const { blockExplorerUrls } =
+    useSelector((state) =>
+      selectNetworkConfigurationByChainId(state, chainId),
+    ) ?? {};
+
+  const blockExplorerUrl = blockExplorerUrls?.[0];
   const unapprovedTxCount = useSelector(getUnapprovedTxCount);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
@@ -387,7 +403,7 @@ export default function TokenAllowance({
         tokenName={tokenSymbol}
         address={tokenAddress}
         chainId={fullTxData.chainId}
-        rpcPrefs={rpcPrefs}
+        blockExplorerUrl={blockExplorerUrl}
       />
     </Box>
   );
@@ -710,7 +726,7 @@ export default function TokenAllowance({
           tokenAddress={tokenAddress}
           toAddress={toAddress}
           chainId={fullTxData.chainId}
-          rpcPrefs={rpcPrefs}
+          blockExplorerUrl={blockExplorerUrl}
         />
       )}
     </Box>
diff --git a/ui/pages/confirmations/token-allowance/token-allowance.test.js b/ui/pages/confirmations/token-allowance/token-allowance.test.js
index ddfc48a2cfaa..68df89777c7e 100644
--- a/ui/pages/confirmations/token-allowance/token-allowance.test.js
+++ b/ui/pages/confirmations/token-allowance/token-allowance.test.js
@@ -203,7 +203,7 @@ describe('TokenAllowancePage', () => {
       status: 'unapproved',
       originalGasEstimate: '0xea60',
       userEditedGasLimit: false,
-      chainId: '0x3',
+      chainId: CHAIN_IDS.MAINNET,
       loadingDefaults: false,
       dappSuggestedGasFees: {
         gasPrice: '0x4a817c800',
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 94d8f39252d8..c4f2928d8ef2 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -734,6 +734,51 @@ export const selectDefaultRpcEndpointByChainId = createSelector(
   },
 );
 
+/**
+ * @type (state: any, chainId: string) => number | undefined
+ */
+export const selectConversionRateByChainId = createSelector(
+  selectNetworkConfigurationByChainId,
+  (state) => state,
+  (networkConfiguration, state) => {
+    if (!networkConfiguration) {
+      return undefined;
+    }
+
+    const { nativeCurrency } = networkConfiguration;
+    return state.metamask.currencyRates[nativeCurrency]?.conversionRate;
+  },
+);
+
+export const selectNftsByChainId = createSelector(
+  getSelectedInternalAccount,
+  (state) => state.metamask.allNfts,
+  (_state, chainId) => chainId,
+  (selectedAccount, nfts, chainId) => {
+    return nfts?.[selectedAccount.address]?.[chainId] ?? [];
+  },
+);
+
+export const selectNftContractsByChainId = createSelector(
+  getSelectedInternalAccount,
+  (state) => state.metamask.allNftContracts,
+  (_state, chainId) => chainId,
+  (selectedAccount, nftContracts, chainId) => {
+    return nftContracts?.[selectedAccount.address]?.[chainId] ?? [];
+  },
+);
+
+export const selectNetworkIdentifierByChainId = createSelector(
+  selectNetworkConfigurationByChainId,
+  selectDefaultRpcEndpointByChainId,
+  (networkConfiguration, defaultRpcEndpoint) => {
+    const { name: nickname } = networkConfiguration ?? {};
+    const { url: rpcUrl, networkClientId } = defaultRpcEndpoint ?? {};
+
+    return nickname || rpcUrl || networkClientId;
+  },
+);
+
 export function getRequestingNetworkInfo(state, chainIds) {
   // If chainIds is undefined, set it to an empty array
   let processedChainIds = chainIds === undefined ? [] : chainIds;

From e882da087d6028a5cd884306a2d4b6c8a59db366 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Fri, 8 Nov 2024 11:19:07 +0000
Subject: [PATCH 060/111] fix: Address design review for ERC20 token send
 (#28212)
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 implements usage of ENS resolved names existing in state for the
PetNames component. It also tweaks various UI elements as per design
review.

<!--
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/28212?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Initiate an erc20 token send on the wallet UI
2. Check the confirmation screen

## **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.
---
 .../info/row/__snapshots__/row.test.tsx.snap  |   2 +-
 ui/components/app/confirm/info/row/row.tsx    |   2 +-
 .../__snapshots__/name-details.test.tsx.snap  |  50 +++-
 .../name/name-details/name-details.test.tsx   | 283 +++++++++++++++++-
 ui/hooks/useDisplayName.test.ts               |  70 ++++-
 ui/hooks/useDisplayName.ts                    |  39 ++-
 .../__snapshots__/approve.test.tsx.snap       |   2 +-
 .../native-transfer.test.tsx.snap             | 193 ++++++------
 .../native-transfer/native-transfer.test.tsx  |   8 +-
 .../nft-token-transfer.test.tsx.snap          | 197 ++++++------
 .../nft-token-transfer.test.tsx               |   8 +-
 .../transaction-data.test.tsx.snap            |   8 +-
 .../token-details-section.test.tsx.snap       |  17 +-
 .../token-transfer.test.tsx.snap              | 242 ++++++++-------
 .../token-transfer/token-details-section.tsx  |   7 +-
 .../token-transfer/token-transfer.test.tsx    |   8 +-
 16 files changed, 770 insertions(+), 366 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 545d548fa3b7..7dad4ee50357 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: 0px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
     >
       <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 55821f7080f5..63d2242461ea 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 : 0, top: 4 }}
+            style={{ right: isCollapsible ? 32 : 4, top: 4 }}
             color={IconColor.iconMuted}
           />
         )}
diff --git a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap
index cfa08b3eee01..da6f598dfa5e 100644
--- a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap
+++ b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap
@@ -706,12 +706,50 @@ exports[`NameDetails renders with recognized name 1`] = `
                 <div
                   class="name name__recognized_unsaved"
                 >
-                  <img
-                    alt=""
-                    class="identicon"
-                    src="https://static.cx.metamask.io/api/v1/tokenIcons/1/0x0a3bb08b3a15a19b4de82f8acfc862606fb69a2d.png"
-                    style="height: 16px; width: 16px; border-radius: 8px;"
-                  />
+                  <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(3, 82, 94);"
+                      >
+                        <svg
+                          height="16"
+                          width="16"
+                          x="0"
+                          y="0"
+                        >
+                          <rect
+                            fill="#F5C000"
+                            height="16"
+                            transform="translate(1.6695934255664566 -1.8063309104606964) rotate(439.0 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#2369E1"
+                            height="16"
+                            transform="translate(2.5174423326839017 8.347530486970694) rotate(166.1 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                          <rect
+                            fill="#FB1864"
+                            height="16"
+                            transform="translate(-12.211473117536537 6.428761618147152) rotate(254.1 8 8)"
+                            width="16"
+                            x="0"
+                            y="0"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
                   <p
                     class="mm-box mm-text name__name mm-text--body-md mm-box--color-text-default"
                   >
diff --git a/ui/components/app/name/name-details/name-details.test.tsx b/ui/components/app/name/name-details/name-details.test.tsx
index 0f0df9f5b5f6..8043d432d526 100644
--- a/ui/components/app/name/name-details/name-details.test.tsx
+++ b/ui/components/app/name/name-details/name-details.test.tsx
@@ -1,18 +1,21 @@
-import React from 'react';
 import { NameType } from '@metamask/name-controller';
-import configureStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
+import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { useDispatch } from 'react-redux';
-import { renderWithProvider } from '../../../../../test/lib/render-helpers';
-import { setName, updateProposedNames } from '../../../../store/actions';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import { useDispatch, useSelector } from 'react-redux';
+import configureStore from 'redux-mock-store';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../../shared/constants/metametrics';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { mockNetworkState } from '../../../../../test/stub/networks';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import { getDomainResolutions } from '../../../../ducks/domains';
+import { getNames, getNameSources } from '../../../../selectors';
+import { getNftContractsByAddressByChain } from '../../../../selectors/nft';
+import { setName, updateProposedNames } from '../../../../store/actions';
 import NameDetails from './name-details';
 
 jest.mock('../../../../store/actions', () => ({
@@ -23,6 +26,7 @@ jest.mock('../../../../store/actions', () => ({
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useDispatch: jest.fn(),
+  useSelector: jest.fn(),
 }));
 
 jest.useFakeTimers();
@@ -150,10 +154,74 @@ describe('NameDetails', () => {
   const setNameMock = jest.mocked(setName);
   const updateProposedNamesMock = jest.mocked(updateProposedNames);
   const useDispatchMock = jest.mocked(useDispatch);
+  const useSelectorMock = jest.mocked(useSelector);
 
   beforeEach(() => {
     jest.resetAllMocks();
     useDispatchMock.mockReturnValue(jest.fn());
+
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getNames) {
+        return {
+          [NameType.ETHEREUM_ADDRESS]: {
+            [ADDRESS_SAVED_NAME_MOCK]: {
+              [VARIATION_MOCK]: {
+                name: SAVED_NAME_MOCK,
+                proposedNames: {
+                  [SOURCE_ID_MOCK]: {
+                    proposedNames: [PROPOSED_NAME_MOCK],
+                    lastRequestTime: null,
+                    retryDelay: null,
+                  },
+                  [SOURCE_ID_2_MOCK]: {
+                    proposedNames: [PROPOSED_NAME_2_MOCK],
+                    lastRequestTime: null,
+                    retryDelay: null,
+                  },
+                },
+              },
+            },
+            [ADDRESS_NO_NAME_MOCK]: {
+              [VARIATION_MOCK]: {
+                name: SAVED_NAME_MOCK,
+                proposedNames: {
+                  [SOURCE_ID_MOCK]: {
+                    proposedNames: [PROPOSED_NAME_MOCK],
+                    lastRequestTime: null,
+                    retryDelay: null,
+                  },
+                  [SOURCE_ID_2_MOCK]: {
+                    proposedNames: [PROPOSED_NAME_2_MOCK],
+                    lastRequestTime: null,
+                    retryDelay: null,
+                  },
+                },
+              },
+            },
+          },
+        };
+      } else if (selector === getNftContractsByAddressByChain) {
+        return {
+          [VARIATION_MOCK]: {
+            [ADDRESS_RECOGNIZED_MOCK]: {
+              name: 'iZUMi Bond USD',
+            },
+          },
+        };
+      } else if (selector === getDomainResolutions) {
+        return [
+          {
+            resolvedAddress: ADDRESS_SAVED_NAME_MOCK,
+            domainName: 'Domain name',
+          },
+        ];
+      } else if (selector === getNameSources) {
+        return {
+          [SOURCE_ID_2_MOCK]: { label: 'Super Name Resolution Snap' },
+        };
+      }
+      return undefined;
+    });
   });
 
   it('renders when no address value is passed', () => {
@@ -171,6 +239,33 @@ describe('NameDetails', () => {
   });
 
   it('renders with no saved name', () => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getNames) {
+        return {
+          [NameType.ETHEREUM_ADDRESS]: {},
+        };
+      } else if (selector === getNftContractsByAddressByChain) {
+        return {
+          [VARIATION_MOCK]: {
+            [ADDRESS_RECOGNIZED_MOCK]: {
+              name: 'iZUMi Bond USD',
+            },
+          },
+        };
+      } else if (selector === getDomainResolutions) {
+        return [
+          {
+            resolvedAddress: ADDRESS_SAVED_NAME_MOCK,
+          },
+        ];
+      } else if (selector === getNameSources) {
+        return {
+          [SOURCE_ID_2_MOCK]: { label: 'Super Name Resolution Snap' },
+        };
+      }
+      return undefined;
+    });
+
     const { baseElement } = renderWithProvider(
       <NameDetails
         type={NameType.ETHEREUM_ADDRESS}
@@ -408,6 +503,50 @@ describe('NameDetails', () => {
     });
 
     it('sends created event', async () => {
+      useSelectorMock.mockImplementation((selector) => {
+        if (selector === getNames) {
+          return {
+            [NameType.ETHEREUM_ADDRESS]: {
+              [ADDRESS_NO_NAME_MOCK]: {
+                [VARIATION_MOCK]: {
+                  proposedNames: {
+                    [SOURCE_ID_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                    [SOURCE_ID_2_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_2_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                  },
+                },
+              },
+            },
+          };
+        } else if (selector === getNftContractsByAddressByChain) {
+          return {
+            [VARIATION_MOCK]: {
+              [ADDRESS_RECOGNIZED_MOCK]: {
+                name: 'iZUMi Bond USD',
+              },
+            },
+          };
+        } else if (selector === getDomainResolutions) {
+          return [
+            {
+              resolvedAddress: ADDRESS_SAVED_NAME_MOCK,
+            },
+          ];
+        } else if (selector === getNameSources) {
+          return {
+            [SOURCE_ID_2_MOCK]: { label: 'Super Name Resolution Snap' },
+          };
+        }
+        return undefined;
+      });
+
       const trackEventMock = jest.fn();
 
       const component = renderWithProvider(
@@ -424,7 +563,7 @@ describe('NameDetails', () => {
 
       await saveNameUsingDropdown(component, PROPOSED_NAME_MOCK);
 
-      expect(trackEventMock).toHaveBeenCalledWith({
+      expect(trackEventMock).toHaveBeenNthCalledWith(2, {
         event: MetaMetricsEventName.PetnameCreated,
         category: MetaMetricsEventCategory.Petnames,
         properties: {
@@ -436,6 +575,69 @@ describe('NameDetails', () => {
     });
 
     it('sends updated event', async () => {
+      useSelectorMock.mockImplementation((selector) => {
+        if (selector === getNames) {
+          return {
+            [NameType.ETHEREUM_ADDRESS]: {
+              [ADDRESS_SAVED_NAME_MOCK]: {
+                [CHAIN_ID_MOCK]: {
+                  proposedNames: {
+                    [SOURCE_ID_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                    [SOURCE_ID_2_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_2_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                  },
+                  name: SAVED_NAME_MOCK,
+                  sourceId: SOURCE_ID_MOCK,
+                },
+              },
+              [ADDRESS_NO_NAME_MOCK]: {
+                [CHAIN_ID_MOCK]: {
+                  proposedNames: {
+                    [SOURCE_ID_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                    [SOURCE_ID_2_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_2_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                  },
+                  name: null,
+                },
+              },
+            },
+          };
+        } else if (selector === getNftContractsByAddressByChain) {
+          return {
+            [VARIATION_MOCK]: {
+              [ADDRESS_RECOGNIZED_MOCK]: {
+                name: 'iZUMi Bond USD',
+              },
+            },
+          };
+        } else if (selector === getDomainResolutions) {
+          return [
+            {
+              resolvedAddress: ADDRESS_SAVED_NAME_MOCK,
+            },
+          ];
+        } else if (selector === getNameSources) {
+          return {
+            [SOURCE_ID_2_MOCK]: { label: 'Super Name Resolution Snap' },
+          };
+        }
+        return undefined;
+      });
+
       const trackEventMock = jest.fn();
 
       const component = renderWithProvider(
@@ -452,7 +654,7 @@ describe('NameDetails', () => {
 
       await saveNameUsingDropdown(component, PROPOSED_NAME_2_MOCK);
 
-      expect(trackEventMock).toHaveBeenCalledWith({
+      expect(trackEventMock).toHaveBeenNthCalledWith(2, {
         event: MetaMetricsEventName.PetnameUpdated,
         category: MetaMetricsEventCategory.Petnames,
         properties: {
@@ -465,6 +667,69 @@ describe('NameDetails', () => {
     });
 
     it('sends deleted event', async () => {
+      useSelectorMock.mockImplementation((selector) => {
+        if (selector === getNames) {
+          return {
+            [NameType.ETHEREUM_ADDRESS]: {
+              [ADDRESS_SAVED_NAME_MOCK]: {
+                [CHAIN_ID_MOCK]: {
+                  proposedNames: {
+                    [SOURCE_ID_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                    [SOURCE_ID_2_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_2_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                  },
+                  name: SAVED_NAME_MOCK,
+                  sourceId: SOURCE_ID_MOCK,
+                },
+              },
+              [ADDRESS_NO_NAME_MOCK]: {
+                [CHAIN_ID_MOCK]: {
+                  proposedNames: {
+                    [SOURCE_ID_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                    [SOURCE_ID_2_MOCK]: {
+                      proposedNames: [PROPOSED_NAME_2_MOCK],
+                      lastRequestTime: null,
+                      retryDelay: null,
+                    },
+                  },
+                  name: null,
+                },
+              },
+            },
+          };
+        } else if (selector === getNftContractsByAddressByChain) {
+          return {
+            [VARIATION_MOCK]: {
+              [ADDRESS_RECOGNIZED_MOCK]: {
+                name: 'iZUMi Bond USD',
+              },
+            },
+          };
+        } else if (selector === getDomainResolutions) {
+          return [
+            {
+              resolvedAddress: ADDRESS_SAVED_NAME_MOCK,
+            },
+          ];
+        } else if (selector === getNameSources) {
+          return {
+            [SOURCE_ID_2_MOCK]: { label: 'Super Name Resolution Snap' },
+          };
+        }
+        return undefined;
+      });
+
       const trackEventMock = jest.fn();
 
       const component = renderWithProvider(
@@ -481,7 +746,7 @@ describe('NameDetails', () => {
 
       await saveNameUsingTextField(component, '');
 
-      expect(trackEventMock).toHaveBeenCalledWith({
+      expect(trackEventMock).toHaveBeenNthCalledWith(2, {
         event: MetaMetricsEventName.PetnameDeleted,
         category: MetaMetricsEventCategory.Petnames,
         properties: {
diff --git a/ui/hooks/useDisplayName.test.ts b/ui/hooks/useDisplayName.test.ts
index 5c36b0a97ed2..896e974c0025 100644
--- a/ui/hooks/useDisplayName.test.ts
+++ b/ui/hooks/useDisplayName.test.ts
@@ -1,19 +1,23 @@
 import { NameType } from '@metamask/name-controller';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
-import { cloneDeep } from 'lodash';
 import { Hex } from '@metamask/utils';
-import { renderHookWithProvider } from '../../test/lib/render-helpers';
-import mockState from '../../test/data/mock-state.json';
+import { cloneDeep } from 'lodash';
 import {
   EXPERIENCES_TYPE,
   FIRST_PARTY_CONTRACT_NAMES,
 } from '../../shared/constants/first-party-contracts';
+import mockState from '../../test/data/mock-state.json';
+import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import { getDomainResolutions } from '../ducks/domains';
 import { useDisplayName } from './useDisplayName';
-import { useNftCollectionsMetadata } from './useNftCollectionsMetadata';
 import { useNames } from './useName';
+import { useNftCollectionsMetadata } from './useNftCollectionsMetadata';
 
 jest.mock('./useName');
 jest.mock('./useNftCollectionsMetadata');
+jest.mock('../ducks/domains', () => ({
+  getDomainResolutions: jest.fn(),
+}));
 
 const VALUE_MOCK = 'testvalue';
 const VARIATION_MOCK = CHAIN_IDS.GOERLI;
@@ -22,6 +26,7 @@ const ERC20_TOKEN_NAME_MOCK = 'testName2';
 const WATCHED_NFT_NAME_MOCK = 'testName3';
 const NFT_NAME_MOCK = 'testName4';
 const FIRST_PARTY_CONTRACT_NAME_MOCK = 'testName5';
+const ENS_NAME_MOCK = 'vitalik.eth';
 const SYMBOL_MOCK = 'tes';
 const NFT_IMAGE_MOCK = 'testNftImage';
 const ERC20_IMAGE_MOCK = 'testImage';
@@ -30,6 +35,7 @@ const OTHER_NAME_TYPE = 'test' as NameType;
 describe('useDisplayName', () => {
   const useNamesMock = jest.mocked(useNames);
   const useNftCollectionsMetadataMock = jest.mocked(useNftCollectionsMetadata);
+  const domainResolutionsMock = jest.mocked(getDomainResolutions);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let state: any;
@@ -87,6 +93,18 @@ describe('useDisplayName', () => {
     });
   }
 
+  function mockDomainResolutions(address: string, ensName: string) {
+    domainResolutionsMock.mockReturnValue([
+      {
+        addressBookEntryName: undefined,
+        domainName: ensName,
+        protocol: 'Ethereum Name Service',
+        resolvedAddress: address,
+        resolvingSnap: 'Ethereum Name Service resolver',
+      },
+    ]);
+  }
+
   function mockFirstPartyContractName(
     value: string,
     variation: string,
@@ -403,6 +421,50 @@ describe('useDisplayName', () => {
     });
   });
 
+  describe('Domain Resolutions', () => {
+    it('returns ENS name if domain resolution for that address exists', () => {
+      mockDomainResolutions(VALUE_MOCK, ENS_NAME_MOCK);
+
+      const { result } = renderHookWithProvider(
+        () =>
+          useDisplayName({
+            value: VALUE_MOCK,
+            type: NameType.ETHEREUM_ADDRESS,
+            variation: VARIATION_MOCK,
+          }),
+        mockState,
+      );
+
+      expect(result.current).toStrictEqual({
+        contractDisplayName: undefined,
+        hasPetname: false,
+        image: undefined,
+        name: ENS_NAME_MOCK,
+      });
+    });
+
+    it('returns no name if type not address', () => {
+      mockDomainResolutions(VALUE_MOCK, ENS_NAME_MOCK);
+
+      const { result } = renderHookWithProvider(
+        () =>
+          useDisplayName({
+            value: VALUE_MOCK,
+            type: OTHER_NAME_TYPE,
+            variation: VARIATION_MOCK,
+          }),
+        mockState,
+      );
+
+      expect(result.current).toStrictEqual({
+        contractDisplayName: undefined,
+        hasPetname: false,
+        image: undefined,
+        name: null,
+      });
+    });
+  });
+
   describe('Priority', () => {
     it('uses petname as first priority', () => {
       mockPetname(PETNAME_MOCK);
diff --git a/ui/hooks/useDisplayName.ts b/ui/hooks/useDisplayName.ts
index 7b7429c7a0d4..66463b884338 100644
--- a/ui/hooks/useDisplayName.ts
+++ b/ui/hooks/useDisplayName.ts
@@ -1,12 +1,14 @@
 import { NameType } from '@metamask/name-controller';
-import { useSelector } from 'react-redux';
 import { Hex } from '@metamask/utils';
-import { selectERC20TokensByChain } from '../selectors';
-import { getNftContractsByAddressByChain } from '../selectors/nft';
+import { useSelector } from 'react-redux';
 import {
   EXPERIENCES_TYPE,
   FIRST_PARTY_CONTRACT_NAMES,
 } from '../../shared/constants/first-party-contracts';
+import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
+import { getDomainResolutions } from '../ducks/domains';
+import { selectERC20TokensByChain } from '../selectors';
+import { getNftContractsByAddressByChain } from '../selectors/nft';
 import { useNames } from './useName';
 import { useNftCollectionsMetadata } from './useNftCollectionsMetadata';
 
@@ -29,9 +31,11 @@ export function useDisplayNames(
 ): UseDisplayNameResponse[] {
   const nameEntries = useNames(requests);
   const firstPartyContractNames = useFirstPartyContractNames(requests);
+
   const erc20Tokens = useERC20Tokens(requests);
   const watchedNFTNames = useWatchedNFTNames(requests);
   const nfts = useNFTs(requests);
+  const ens = useDomainResolutions(requests);
 
   return requests.map((_request, index) => {
     const nameEntry = nameEntries[index];
@@ -39,6 +43,7 @@ export function useDisplayNames(
     const erc20Token = erc20Tokens[index];
     const watchedNftName = watchedNFTNames[index];
     const nft = nfts[index];
+    const ensName = ens[index];
 
     const name =
       nameEntry?.name ||
@@ -46,6 +51,7 @@ export function useDisplayNames(
       nft?.name ||
       erc20Token?.name ||
       watchedNftName ||
+      ensName ||
       null;
 
     const image = nft?.image || erc20Token?.image;
@@ -107,6 +113,7 @@ function useWatchedNFTNames(
 
     const contractAddress = value.toLowerCase();
     const watchedNftNamesByAddress = watchedNftNamesByAddressByChain[variation];
+
     return watchedNftNamesByAddress?.[contractAddress]?.name;
   });
 }
@@ -147,6 +154,32 @@ function useNFTs(
   );
 }
 
+function useDomainResolutions(nameRequests: UseDisplayNameRequest[]) {
+  const domainResolutions = useSelector(getDomainResolutions);
+
+  return nameRequests.map(({ type, value }) => {
+    if (type !== NameType.ETHEREUM_ADDRESS) {
+      return undefined;
+    }
+
+    const matchedResolution = domainResolutions?.find(
+      (resolution: {
+        addressBookEntryName: string;
+        domainName: string;
+        protocol: string;
+        resolvedAddress: string;
+        resolvingSnap: string;
+      }) =>
+        toChecksumHexAddress(resolution.resolvedAddress) ===
+        toChecksumHexAddress(value),
+    );
+
+    const ensName = matchedResolution?.domainName;
+
+    return ensName;
+  });
+}
+
 function useFirstPartyContractNames(nameRequests: UseDisplayNameRequest[]) {
   return nameRequests.map(({ type, value, variation }) => {
     if (type !== NameType.ETHEREUM_ADDRESS) {
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 e8341e9a6014..8b5e0c683b51 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
@@ -652,7 +652,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: 0px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
       >
         <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/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index 843002b76884..4181d12bee5c 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
@@ -17,34 +17,47 @@ exports[`NativeTransferInfo renders correctly 1`] = `
     </h2>
   </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"
+    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
-    <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"
+    <svg
+      class="preloader__icon"
+      fill="none"
+      height="20"
+      viewBox="0 0 16 16"
+      width="20"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <div
-        class="mm-box mm-box--display-flex"
-      >
-        <div
-          class="name name__missing"
-        >
-          <span
-            class="mm-box name__icon mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/question.svg');"
-          />
-          <p
-            class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-      <span
-        class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-icon-muted"
-        style="mask-image: url('./images/icons/arrow-right.svg');"
+      <path
+        clip-rule="evenodd"
+        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+        fill="var(--color-primary-muted)"
+        fill-rule="evenodd"
       />
-    </div>
+      <mask
+        height="16"
+        id="mask0"
+        mask-type="alpha"
+        maskUnits="userSpaceOnUse"
+        width="16"
+        x="0"
+        y="0"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+          fill="var(--color-primary-default)"
+          fill-rule="evenodd"
+        />
+      </mask>
+      <g
+        mask="url(#mask0)"
+      >
+        <path
+          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+          fill="var(--color-primary-default)"
+        />
+      </g>
+    </svg>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
@@ -89,83 +102,48 @@ exports[`NativeTransferInfo renders correctly 1`] = `
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-      >
         <div
-          class="mm-box"
+          role="progressbar"
         >
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-            data-testid="simulation-rows-outgoing"
+          <svg
+            class="preloader__icon"
+            fill="none"
+            height="20"
+            viewBox="0 0 16 16"
+            width="20"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--align-items-flex-start"
-              data-testid="simulation-details-balance-change-row"
+            <path
+              clip-rule="evenodd"
+              d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+              fill="var(--color-primary-muted)"
+              fill-rule="evenodd"
+            />
+            <mask
+              height="16"
+              id="mask0"
+              mask-type="alpha"
+              maskUnits="userSpaceOnUse"
+              width="16"
+              x="0"
+              y="0"
             >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-                style="white-space: nowrap;"
-              >
-                You send
-              </p>
-              <div
-                class="mm-box mm-box--margin-left-auto mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column"
-                style="min-width: 0;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-error-muted mm-box--rounded-pill"
-                    data-testid="simulation-details-amount-pill"
-                    style="padding: 0px 8px; flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      style="min-width: 0;"
-                    >
-                      <div
-                        aria-describedby="tippy-tooltip-3"
-                        class=""
-                        data-original-title="4"
-                        data-tooltipped=""
-                        style="display: inline;"
-                        tabindex="0"
-                      >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-error-alternative"
-                        >
-                          - 4
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box"
-                    data-testid="simulation-details-asset-pill"
-                    style="flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
-                      style="padding: 1px 8px 1px 4px;"
-                    >
-                      <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"
-                      >
-                        E
-                      </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default"
-                      >
-                        ETH
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+              <path
+                clip-rule="evenodd"
+                d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+                fill="var(--color-primary-default)"
+                fill-rule="evenodd"
+              />
+            </mask>
+            <g
+              mask="url(#mask0)"
+            >
+              <path
+                d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+                fill="var(--color-primary-default)"
+              />
+            </g>
+          </svg>
         </div>
       </div>
     </div>
@@ -195,7 +173,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-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-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"
         >
           G
         </div>
@@ -221,6 +199,21 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           >
             Interacting with
           </p>
+          <div>
+            <div
+              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=""
+              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"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
         </div>
       </div>
       <div
@@ -304,7 +297,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               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.test.tsx b/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.test.tsx
index f4b2b4afab50..e08710b551aa 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.test.tsx
@@ -1,9 +1,7 @@
-import { screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { getMockTokenTransferConfirmState } from '../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
-import { tEn } from '../../../../../../../test/lib/i18n-helpers';
 import NativeTransferInfo from './native-transfer';
 
 jest.mock(
@@ -24,7 +22,7 @@ jest.mock('../../../../../../store/actions', () => ({
 }));
 
 describe('NativeTransferInfo', () => {
-  it('renders correctly', async () => {
+  it('renders correctly', () => {
     const state = getMockTokenTransferConfirmState({});
     const mockStore = configureMockStore([])(state);
     const { container } = renderWithConfirmContextProvider(
@@ -32,10 +30,6 @@ describe('NativeTransferInfo', () => {
       mockStore,
     );
 
-    await waitFor(() => {
-      expect(screen.getByText(tEn('networkFee') as string)).toBeInTheDocument();
-    });
-
     expect(container).toMatchSnapshot();
   });
 });
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 8bd4a73fe440..77794c9e70a4 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
@@ -15,39 +15,50 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
     />
     <p
       class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
-    >
-      1
-    </p>
+    />
   </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"
+    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
-    <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"
+    <svg
+      class="preloader__icon"
+      fill="none"
+      height="20"
+      viewBox="0 0 16 16"
+      width="20"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <div
-        class="mm-box mm-box--display-flex"
-      >
-        <div
-          class="name name__missing"
-        >
-          <span
-            class="mm-box name__icon mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/question.svg');"
-          />
-          <p
-            class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-      <span
-        class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-icon-muted"
-        style="mask-image: url('./images/icons/arrow-right.svg');"
+      <path
+        clip-rule="evenodd"
+        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+        fill="var(--color-primary-muted)"
+        fill-rule="evenodd"
       />
-    </div>
+      <mask
+        height="16"
+        id="mask0"
+        mask-type="alpha"
+        maskUnits="userSpaceOnUse"
+        width="16"
+        x="0"
+        y="0"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+          fill="var(--color-primary-default)"
+          fill-rule="evenodd"
+        />
+      </mask>
+      <g
+        mask="url(#mask0)"
+      >
+        <path
+          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+          fill="var(--color-primary-default)"
+        />
+      </g>
+    </svg>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
@@ -92,83 +103,48 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-      >
         <div
-          class="mm-box"
+          role="progressbar"
         >
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-            data-testid="simulation-rows-outgoing"
+          <svg
+            class="preloader__icon"
+            fill="none"
+            height="20"
+            viewBox="0 0 16 16"
+            width="20"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--align-items-flex-start"
-              data-testid="simulation-details-balance-change-row"
+            <path
+              clip-rule="evenodd"
+              d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+              fill="var(--color-primary-muted)"
+              fill-rule="evenodd"
+            />
+            <mask
+              height="16"
+              id="mask0"
+              mask-type="alpha"
+              maskUnits="userSpaceOnUse"
+              width="16"
+              x="0"
+              y="0"
             >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-                style="white-space: nowrap;"
-              >
-                You send
-              </p>
-              <div
-                class="mm-box mm-box--margin-left-auto mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column"
-                style="min-width: 0;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-error-muted mm-box--rounded-pill"
-                    data-testid="simulation-details-amount-pill"
-                    style="padding: 0px 8px; flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      style="min-width: 0;"
-                    >
-                      <div
-                        aria-describedby="tippy-tooltip-3"
-                        class=""
-                        data-original-title="4"
-                        data-tooltipped=""
-                        style="display: inline;"
-                        tabindex="0"
-                      >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-error-alternative"
-                        >
-                          - 4
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box"
-                    data-testid="simulation-details-asset-pill"
-                    style="flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
-                      style="padding: 1px 8px 1px 4px;"
-                    >
-                      <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"
-                      >
-                        E
-                      </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default"
-                      >
-                        ETH
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+              <path
+                clip-rule="evenodd"
+                d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+                fill="var(--color-primary-default)"
+                fill-rule="evenodd"
+              />
+            </mask>
+            <g
+              mask="url(#mask0)"
+            >
+              <path
+                d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+                fill="var(--color-primary-default)"
+              />
+            </g>
+          </svg>
         </div>
       </div>
     </div>
@@ -198,7 +174,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-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-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"
         >
           G
         </div>
@@ -224,6 +200,21 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           >
             Interacting with
           </p>
+          <div>
+            <div
+              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=""
+              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"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
         </div>
       </div>
       <div
@@ -307,7 +298,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               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.test.tsx b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.test.tsx
index 77fd4485e3dc..7b562fb3bb9e 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.test.tsx
@@ -1,9 +1,7 @@
-import { screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { getMockTokenTransferConfirmState } from '../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
-import { tEn } from '../../../../../../../test/lib/i18n-helpers';
 import NFTTokenTransferInfo from './nft-token-transfer';
 
 jest.mock(
@@ -24,7 +22,7 @@ jest.mock('../../../../../../store/actions', () => ({
 }));
 
 describe('NFTTokenTransferInfo', () => {
-  it('renders correctly', async () => {
+  it('renders correctly', () => {
     const state = getMockTokenTransferConfirmState({});
     const mockStore = configureMockStore([])(state);
     const { container } = renderWithConfirmContextProvider(
@@ -32,10 +30,6 @@ describe('NFTTokenTransferInfo', () => {
       mockStore,
     );
 
-    await waitFor(() => {
-      expect(screen.getByText(tEn('networkFee') as string)).toBeInTheDocument();
-    });
-
     expect(container).toMatchSnapshot();
   });
 });
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 d03e04d2c673..1b7fd2aeb460 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: 0px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1011,7 +1011,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: 0px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1231,7 +1231,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: 0px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -2293,7 +2293,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: 0px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
       >
         <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/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 c545cea1f66d..dcedd06b1557 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-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-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"
         >
           G
         </div>
@@ -53,6 +53,21 @@ exports[`TokenDetailsSection renders correctly 1`] = `
           >
             Interacting with
           </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-1"
+              class=""
+              data-original-title="This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
+              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"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
         </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 05a1db6732f5..a76528600fb5 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
@@ -3,48 +3,90 @@
 exports[`TokenTransferInfo renders correctly 1`] = `
 <div>
   <div
-    class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--align-items-center"
+    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
-    <div
-      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-token mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-muted mm-box--background-color-overlay-default mm-box--rounded-full"
-    >
-      ?
-    </div>
-    <h2
-      class="mm-box mm-text mm-text--heading-lg mm-box--margin-top-3 mm-box--color-inherit"
+    <svg
+      class="preloader__icon"
+      fill="none"
+      height="20"
+      viewBox="0 0 16 16"
+      width="20"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      0 Unknown
-    </h2>
+      <path
+        clip-rule="evenodd"
+        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+        fill="var(--color-primary-muted)"
+        fill-rule="evenodd"
+      />
+      <mask
+        height="16"
+        id="mask0"
+        mask-type="alpha"
+        maskUnits="userSpaceOnUse"
+        width="16"
+        x="0"
+        y="0"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+          fill="var(--color-primary-default)"
+          fill-rule="evenodd"
+        />
+      </mask>
+      <g
+        mask="url(#mask0)"
+      >
+        <path
+          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+          fill="var(--color-primary-default)"
+        />
+      </g>
+    </svg>
   </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"
+    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
-    <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"
+    <svg
+      class="preloader__icon"
+      fill="none"
+      height="20"
+      viewBox="0 0 16 16"
+      width="20"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <div
-        class="mm-box mm-box--display-flex"
-      >
-        <div
-          class="name name__missing"
-        >
-          <span
-            class="mm-box name__icon mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
-            style="mask-image: url('./images/icons/question.svg');"
-          />
-          <p
-            class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-      <span
-        class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-icon-muted"
-        style="mask-image: url('./images/icons/arrow-right.svg');"
+      <path
+        clip-rule="evenodd"
+        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+        fill="var(--color-primary-muted)"
+        fill-rule="evenodd"
       />
-    </div>
+      <mask
+        height="16"
+        id="mask0"
+        mask-type="alpha"
+        maskUnits="userSpaceOnUse"
+        width="16"
+        x="0"
+        y="0"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+          fill="var(--color-primary-default)"
+          fill-rule="evenodd"
+        />
+      </mask>
+      <g
+        mask="url(#mask0)"
+      >
+        <path
+          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+          fill="var(--color-primary-default)"
+        />
+      </g>
+    </svg>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
@@ -89,83 +131,48 @@ exports[`TokenTransferInfo renders correctly 1`] = `
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-      >
         <div
-          class="mm-box"
+          role="progressbar"
         >
-          <div
-            class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column"
-            data-testid="simulation-rows-outgoing"
+          <svg
+            class="preloader__icon"
+            fill="none"
+            height="20"
+            viewBox="0 0 16 16"
+            width="20"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--align-items-flex-start"
-              data-testid="simulation-details-balance-change-row"
+            <path
+              clip-rule="evenodd"
+              d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+              fill="var(--color-primary-muted)"
+              fill-rule="evenodd"
+            />
+            <mask
+              height="16"
+              id="mask0"
+              mask-type="alpha"
+              maskUnits="userSpaceOnUse"
+              width="16"
+              x="0"
+              y="0"
             >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-                style="white-space: nowrap;"
-              >
-                You send
-              </p>
-              <div
-                class="mm-box mm-box--margin-left-auto mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column"
-                style="min-width: 0;"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row"
-                >
-                  <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-error-muted mm-box--rounded-pill"
-                    data-testid="simulation-details-amount-pill"
-                    style="padding: 0px 8px; flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      style="min-width: 0;"
-                    >
-                      <div
-                        aria-describedby="tippy-tooltip-3"
-                        class=""
-                        data-original-title="4"
-                        data-tooltipped=""
-                        style="display: inline;"
-                        tabindex="0"
-                      >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-error-alternative"
-                        >
-                          - 4
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="mm-box"
-                    data-testid="simulation-details-asset-pill"
-                    style="flex-shrink: 1; flex-basis: auto; min-width: 0;"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
-                      style="padding: 1px 8px 1px 4px;"
-                    >
-                      <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"
-                      >
-                        E
-                      </div>
-                      <p
-                        class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default"
-                      >
-                        ETH
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+              <path
+                clip-rule="evenodd"
+                d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
+                fill="var(--color-primary-default)"
+                fill-rule="evenodd"
+              />
+            </mask>
+            <g
+              mask="url(#mask0)"
+            >
+              <path
+                d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
+                fill="var(--color-primary-default)"
+              />
+            </g>
+          </svg>
         </div>
       </div>
     </div>
@@ -195,7 +202,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-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-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"
         >
           G
         </div>
@@ -221,6 +228,21 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           >
             Interacting with
           </p>
+          <div>
+            <div
+              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=""
+              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"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
         </div>
       </div>
       <div
@@ -304,7 +326,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               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 629d7d64df3a..c4a563fbc4dd 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
@@ -49,7 +49,7 @@ export const TokenDetailsSection = () => {
       >
         <AvatarNetwork
           borderColor={BorderColor.backgroundDefault}
-          size={AvatarNetworkSize.Sm}
+          size={AvatarNetworkSize.Xs}
           src={
             CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
               chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
@@ -65,7 +65,10 @@ export const TokenDetailsSection = () => {
   );
 
   const tokenRow = transactionMeta.type !== TransactionType.simpleSend && (
-    <ConfirmInfoRow label={t('interactingWith')}>
+    <ConfirmInfoRow
+      label={t('interactingWith')}
+      tooltip={t('interactingWithTransactionDescription')}
+    >
       <ConfirmInfoRowAddress
         address={transactionMeta.txParams.to as string}
         chainId={chainId}
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.test.tsx b/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.test.tsx
index 76c419cbb0be..e0aced73a36b 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.test.tsx
@@ -1,9 +1,7 @@
-import { screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { getMockTokenTransferConfirmState } from '../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
-import { tEn } from '../../../../../../../test/lib/i18n-helpers';
 import TokenTransferInfo from './token-transfer';
 
 jest.mock(
@@ -24,7 +22,7 @@ jest.mock('../../../../../../store/actions', () => ({
 }));
 
 describe('TokenTransferInfo', () => {
-  it('renders correctly', async () => {
+  it('renders correctly', () => {
     const state = getMockTokenTransferConfirmState({});
     const mockStore = configureMockStore([])(state);
     const { container } = renderWithConfirmContextProvider(
@@ -32,10 +30,6 @@ describe('TokenTransferInfo', () => {
       mockStore,
     );
 
-    await waitFor(() => {
-      expect(screen.getByText(tEn('networkFee') as string)).toBeInTheDocument();
-    });
-
     expect(container).toMatchSnapshot();
   });
 });

From 1d4fcc0c31b497b9c4d3a867d31b37c6dd38e32d Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Fri, 8 Nov 2024 19:22:56 +0800
Subject: [PATCH 061/111] fix: disable buy for btc testnet accounts (#28341)
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 disables the Buy / sell button for btc testnet accounts

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/655

## **Manual testing steps**

1. Create a testnet btc account
2. Go to the overview page
3. See that the buy/sell 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] -->

## **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/wallet-overview/btc-overview.test.tsx | 30 +++++++++++++++++++
 .../app/wallet-overview/btc-overview.tsx      | 12 +++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/wallet-overview/btc-overview.test.tsx b/ui/components/app/wallet-overview/btc-overview.test.tsx
index abff2cb2b239..ffaed244e958 100644
--- a/ui/components/app/wallet-overview/btc-overview.test.tsx
+++ b/ui/components/app/wallet-overview/btc-overview.test.tsx
@@ -233,4 +233,34 @@ describe('BtcOverview', () => {
     const receiveButton = queryByTestId(BTC_OVERVIEW_RECEIVE);
     expect(receiveButton).toBeInTheDocument();
   });
+
+  it('"Buy & Sell" button is disabled for testnet accounts', () => {
+    const storeWithBtcBuyable = getStore({
+      metamask: {
+        ...mockMetamaskStore,
+        internalAccounts: {
+          ...mockMetamaskStore.internalAccounts,
+          accounts: {
+            [mockNonEvmAccount.id]: {
+              ...mockNonEvmAccount,
+              address: 'tb1q9lakrt5sw0w0twnc6ww4vxs7hm0q23e03286k8',
+            },
+          },
+        },
+      },
+      ramps: {
+        buyableChains: mockBuyableChainsWithBtc,
+      },
+    });
+
+    const { queryByTestId } = renderWithProvider(
+      <BtcOverview />,
+      storeWithBtcBuyable,
+    );
+
+    const buyButton = queryByTestId(BTC_OVERVIEW_BUY);
+
+    expect(buyButton).toBeInTheDocument();
+    expect(buyButton).toBeDisabled();
+  });
 });
diff --git a/ui/components/app/wallet-overview/btc-overview.tsx b/ui/components/app/wallet-overview/btc-overview.tsx
index dc47df7567b5..2ddaefd92f58 100644
--- a/ui/components/app/wallet-overview/btc-overview.tsx
+++ b/ui/components/app/wallet-overview/btc-overview.tsx
@@ -1,11 +1,16 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import {
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  getMultichainIsMainnet,
+  ///: END:ONLY_INCLUDE_IF
   getMultichainProviderConfig,
   getMultichainSelectedAccountCachedBalance,
 } from '../../../selectors/multichain';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { getIsBitcoinBuyable } from '../../../ducks/ramps';
+import { getSelectedInternalAccount } from '../../../selectors';
+import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 ///: END:ONLY_INCLUDE_IF
 import { CoinOverview } from './coin-overview';
 
@@ -17,6 +22,11 @@ const BtcOverview = ({ className }: BtcOverviewProps) => {
   const { chainId } = useSelector(getMultichainProviderConfig);
   const balance = useSelector(getMultichainSelectedAccountCachedBalance);
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const selectedAccount = useSelector(getSelectedInternalAccount);
+  const isBtcMainnetAccount = useMultichainSelector(
+    getMultichainIsMainnet,
+    selectedAccount,
+  );
   const isBtcBuyable = useSelector(getIsBitcoinBuyable);
   ///: END:ONLY_INCLUDE_IF
 
@@ -31,7 +41,7 @@ const BtcOverview = ({ className }: BtcOverviewProps) => {
       isSwapsChain={false}
       ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
       isBridgeChain={false}
-      isBuyableChain={isBtcBuyable}
+      isBuyableChain={isBtcBuyable && isBtcMainnetAccount}
       ///: END:ONLY_INCLUDE_IF
     />
   );

From 152a50ef8fec9d8a038313c50df107f97ec80c20 Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Fri, 8 Nov 2024 14:13:07 +0000
Subject: [PATCH 062/111] feat(1852): Implement sentry user report on error
 screen (#27857)
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**
Sentry provides a feature to collect user feedback to users when an
issue occurs. This could be a great help to fix Sentry issues which
sometimes come without a lot of context and are difficult to reproduce.

Hence we use out-of-box solution from sentry to implement [User Feedback
Widget](https://docs.sentry.io/platforms/javascript/user-feedback/configuration/#user-feedback-widget)
via `Sentry.feedbackIntegration`. You can find more technical details in
[this
comment](https://github.com/MetaMask/MetaMask-planning/issues/1852#issuecomment-2392480544).

Design Figma link
[here](https://www.figma.com/design/DM5G1pyp74sMJwyKbw1KiR/Error-message-and-bug-report?node-id=1-4243&node-type=frame&t=iZI13qsxataukM4a-0).

### What's expected in this PR:
- Refactor original `ui/pages/error/error.component.js` to typescript,
clean up / update language content, and improve the layout based on new
design (see above Figma link) that would be consistent as mobile
implementation
- Add a new option in `develop options` to cause a page crash by remove
one language file (for me was easiest way to trigger), which will bring
us to error page
- In new error page, we have 3 options:
1. Describe what happened - open a form to sent a message to sentry
2. Contact support - existing link to redirect to
`process.env.SUPPORT_REQUEST_LINK`
3. Try again - close the extension and allow user to open again
- Convert `ui/ducks/locale/locale.js` to typescript and add related
tests
- Add e2e tests with POM pattern

**This is the scenario for extension:**
- GIVEN a user has MM installed
- AND Sentry is enabled (user enabled MetaMetrics)
- WHEN an unhandled issue occurs in MM
- THEN MM crashes
- AND an event is sent to Sentry
- AND user is given the possibility to describe what happened to him by
filling a form
- AND his feedback gets paired to the Sentry event once user presses the
"submit" button at the bottom of the form
- AND user is given more comprehensive error screen when it crashes

<!--
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/27857?quickstart=1)

## **Related issues**

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

## **Manual testing steps**
1. Set up sentry
(https://github.com/MetaMask/metamask-extension/blob/develop/development/README.md)
2. Add DSN to `SENTRY_DSN_DEV` in local env set up, and mark
`ENABLE_SETTINGS_PAGE_DEV_OPTIONS`=true
3. Run `yarn webpack --watch --sentry`
4. Ensure `Participate in MetaMetrics` is opt in
5. Click "develop options" in settings
6. Click "Generate A Page Crash" button
7. User is redirected to new error page
8. Click `Describe what happened` can open a sentry feedback form, then
in your sentry project you can find the submitted form within `User
Feedback` section
9. Click `Contact support` will redirect user to metamask support page
10. Click `Try again` will close the extension and ready for reload

## **Screenshots/Recordings**

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

### **Before**

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

### **After**


https://github.com/user-attachments/assets/56145a44-82d3-4d07-be03-87d81ee6a9d7


## **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                 |  12 -
 app/_locales/el/messages.json                 |  12 -
 app/_locales/en/messages.json                 |  40 ++-
 app/_locales/en_GB/messages.json              |  12 -
 app/_locales/es/messages.json                 |  12 -
 app/_locales/es_419/messages.json             |  12 -
 app/_locales/fr/messages.json                 |  12 -
 app/_locales/hi/messages.json                 |  12 -
 app/_locales/id/messages.json                 |  12 -
 app/_locales/it/messages.json                 |   4 -
 app/_locales/ja/messages.json                 |  12 -
 app/_locales/ko/messages.json                 |  12 -
 app/_locales/ph/messages.json                 |  12 -
 app/_locales/pt/messages.json                 |  12 -
 app/_locales/pt_BR/messages.json              |  12 -
 app/_locales/ru/messages.json                 |  12 -
 app/_locales/tl/messages.json                 |  12 -
 app/_locales/tr/messages.json                 |  12 -
 app/_locales/vi/messages.json                 |  12 -
 app/_locales/zh_CN/messages.json              |  12 -
 app/_locales/zh_TW/messages.json              |  12 -
 privacy-snapshot.json                         |   2 +
 shared/constants/metametrics.ts               |   4 +
 shared/modules/i18n.test.ts                   |  16 +-
 shared/modules/i18n.ts                        |   3 +-
 test/data/mock-state.json                     |   8 +-
 test/e2e/helpers.js                           |   5 +-
 .../pages/developer-options-page.ts           |  38 +++
 test/e2e/page-objects/pages/error-page.ts     |  95 ++++++
 test/e2e/page-objects/pages/settings-page.ts  |  10 +
 .../metrics/developer-options-sentry.spec.ts  |  88 +++++
 test/e2e/tests/metrics/errors.spec.js         |   3 +-
 ui/ducks/locale/locale.js                     |  42 ---
 ui/ducks/locale/locale.test.ts                |  80 ++++-
 ui/ducks/locale/locale.ts                     | 108 ++++++
 ui/pages/error-page/error-component.test.tsx  | 192 +++++++++++
 ui/pages/error-page/error-page.component.tsx  | 312 ++++++++++++++++++
 ui/pages/error-page/index.scss                |  41 +++
 ui/pages/error-page/index.ts                  |   1 +
 ui/pages/error/error.component.js             | 106 ------
 ui/pages/error/index.js                       |   1 -
 ui/pages/error/index.scss                     |  47 ---
 ui/pages/index.js                             |   7 +-
 ui/pages/pages.scss                           |   2 +-
 .../developer-options-tab.test.tsx.snap       |  46 ++-
 .../developer-options-tab.tsx                 |   2 +-
 .../developer-options-tab/sentry-test.tsx     |  66 +++-
 ui/pages/settings/settings.component.js       |   5 +-
 48 files changed, 1124 insertions(+), 478 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/developer-options-page.ts
 create mode 100644 test/e2e/page-objects/pages/error-page.ts
 create mode 100644 test/e2e/tests/metrics/developer-options-sentry.spec.ts
 delete mode 100644 ui/ducks/locale/locale.js
 create mode 100644 ui/ducks/locale/locale.ts
 create mode 100644 ui/pages/error-page/error-component.test.tsx
 create mode 100644 ui/pages/error-page/error-page.component.tsx
 create mode 100644 ui/pages/error-page/index.scss
 create mode 100644 ui/pages/error-page/index.ts
 delete mode 100644 ui/pages/error/error.component.js
 delete mode 100644 ui/pages/error/index.js
 delete mode 100644 ui/pages/error/index.scss

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 19c7731c778f..f62b15c08c93 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Code: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Fehlerdetails",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Fehler beim Abrufen der Liste sicherer Ketten, bitte mit Vorsicht fortfahren."
   },
@@ -1711,14 +1707,6 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Versuchen Sie es erneut, indem Sie die Seite neu laden oder kontaktieren Sie den Support $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Versuchen Sie es erneut, indem das Popup schließen und neu laden oder kontaktieren Sie den Support $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask hat einen Fehler festgestellt.",
     "description": "Title of generic error page"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index ac4542893959..3bede7c85edb 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Κωδικός: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Λεπτομέρειες σφάλματος",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Σφάλμα κατά τη λήψη της λίστας ασφαλών αλυσίδων, συνεχίστε με προσοχή."
   },
@@ -1711,14 +1707,6 @@
     "message": "Κωδικός: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Προσπαθήστε ξανά με επαναφόρτωση της σελίδας ή επικοινωνήστε με την υποστήριξη $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Προσπαθήστε ξανά κλείνοντας και ανοίγοντας ξανά το αναδυόμενο παράθυρο ή επικοινωνήστε με την υποστήριξη $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "Το MetaMask αντιμετώπισε ένα σφάλμα",
     "description": "Title of generic error page"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 202dc04c2fa8..56e3614e3f39 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1940,10 +1940,6 @@
     "message": "Code: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Error details",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Error while getting safe chain list, please continue with caution."
   },
@@ -1955,18 +1951,42 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Try again by reloading the page, or contact support $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
+  "errorPageContactSupport": {
+    "message": "Contact support",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Describe what happened",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Your information can’t be shown. Don’t worry, your wallet and funds are safe.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Error message",
+    "description": "Title for description, which is displayed for debugging purposes"
   },
-  "errorPagePopupMessage": {
-    "message": "Try again by closing and reopening the popup, or contact support $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
+  "errorPageSentryFormTitle": {
+    "message": "Describe what happened",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Sharing details like how we can reproduce the bug will help us fix the problem.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Thanks! We will take a look soon.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
   },
   "errorPageTitle": {
     "message": "MetaMask encountered an error",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Try again",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Stack:",
     "description": "Title for error stack, which is displayed for debugging purposes"
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 8dd2e32dac39..9ee7771947ba 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -1792,10 +1792,6 @@
     "message": "Code: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Error details",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Error while getting safe chain list, please continue with caution."
   },
@@ -1807,14 +1803,6 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Try again by reloading the page, or contact support $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Try again by closing and reopening the popup, or contact support $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask encountered an error",
     "description": "Title of generic error page"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 1d23b736fbfd..f13313976e74 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1693,10 +1693,6 @@
     "message": "Código: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Detalles del error",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Error al obtener la lista de cadenas seguras, por favor continúe con precaución."
   },
@@ -1708,14 +1704,6 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Vuelva a cargar la página para intentarlo de nuevo o comuníquese con soporte técnico $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Cierre la ventana emergente y vuelva a abrirla para intentarlo de nuevo o comuníquese con soporte técnico $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask encontró un error",
     "description": "Title of generic error page"
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index cebfc3cef106..511ee6cbef71 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -686,10 +686,6 @@
     "message": "Código: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Detalles del error",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorMessage": {
     "message": "Mensaje: $1",
     "description": "Displayed error message for debugging purposes. $1 is the error message"
@@ -698,14 +694,6 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Vuelva a cargar la página para intentarlo de nuevo o comuníquese con soporte técnico $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Cierre la ventana emergente y vuelva a abrirla para intentarlo de nuevo o comuníquese con soporte técnico $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask encontró un error",
     "description": "Title of generic error page"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index e9b8fd588b89..c785d2e0a00a 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Code : $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Détails de l’erreur",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Erreur lors de l’obtention de la liste des chaînes sécurisées, veuillez continuer avec précaution."
   },
@@ -1711,14 +1707,6 @@
     "message": "Code : $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Essayez à nouveau en rechargeant la page, ou contactez le service d’assistance $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Réessayez en fermant puis en rouvrant le pop-up, ou contactez le service d’assistance $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask a rencontré une erreur",
     "description": "Title of generic error page"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 9b2c06f96c11..554bb2e91b84 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1696,10 +1696,6 @@
     "message": "कोड: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "गड़बड़ी की जानकारी",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "सेफ चेन लिस्ट पाते समय गड़बड़ी हुई, कृपया सावधानी के साथ जारी रखें।"
   },
@@ -1711,14 +1707,6 @@
     "message": "कोड: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "पेज को दोबारा लोड करके फिर से कोशिश करें या सपोर्ट $1 से कॉन्टेक्ट करें।",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "पॉपअप को बंद करके और फिर से खोलने की कोशिश करें या $1 पर सपोर्ट से कॉन्टेक्ट करें।",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask में कोई गड़बड़ी हुई",
     "description": "Title of generic error page"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 1331d7b9c482..8e60e6fe5a50 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Kode: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Detail kesalahan",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Terjadi kesalahan saat mendapatkan daftar rantai aman, lanjutkan dengan hati-hati."
   },
@@ -1711,14 +1707,6 @@
     "message": "Kode: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Coba lagi dengan memuat kembali halaman, atau hubungi dukungan $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Coba lagi dengan menutup dan membuka kembali sembulan, atau hubungi dukungan $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask mengalami kesalahan",
     "description": "Title of generic error page"
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 0c79dd8fc6fc..05cccdac0359 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -736,10 +736,6 @@
     "message": "Codice: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Dettagli Errore",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorMessage": {
     "message": "Messaggio: $1",
     "description": "Displayed error message for debugging purposes. $1 is the error message"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 3107eb3cb152..69824ae33b52 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1696,10 +1696,6 @@
     "message": "コード: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "エラーの詳細",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "安全なチェーンリストの取得中にエラーが発生しました。慎重に続けてください。"
   },
@@ -1711,14 +1707,6 @@
     "message": "コード: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "ページを再ロードしてもう一度実行するか、$1からサポートまでお問い合わせください。",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "ポップアップを閉じてから再び開いてもう一度実行するか、$1からサポートまでお問い合わせください。",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMaskにエラーが発生しました",
     "description": "Title of generic error page"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 6dc468cdd5ef..f160b3dccbc2 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1696,10 +1696,6 @@
     "message": "코드: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "오류 세부 정보",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "안전 체인 목록을 가져오는 동안 오류가 발생했습니다. 주의하여 계속 진행하세요."
   },
@@ -1711,14 +1707,6 @@
     "message": "코드: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "페이지를 새로고침하여 다시 시도하거나 $1로 지원을 요청하여 도움을 받으세요.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "팝업을 닫은 후 다시 열어 다시 시도하거나 $1에서 지원을 요청하여 도움을 받으세요.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask 오류 발생",
     "description": "Title of generic error page"
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index e6b4bc3e7811..3c08d76cb186 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -423,10 +423,6 @@
     "message": "Code: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Mga Detalye ng Error",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorMessage": {
     "message": "Mensahe: $1",
     "description": "Displayed error message for debugging purposes. $1 is the error message"
@@ -435,14 +431,6 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Subukan ulit sa pamamagitan ng pag-reload ng page, o makipag-ugnayan sa suporta sa $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Subukan ulit sa pamamagitan ng pagsara at pagbukas ulit ng popup, o makipag-ugnayan sa suporta sa $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "Nagkaroon ng error sa MetaMask",
     "description": "Title of generic error page"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 03f41c1c62b8..589a58e94907 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Código: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Detalhes do erro",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Erro ao obter uma lista segura da cadeia. Por favor, prossiga com cautela."
   },
@@ -1711,14 +1707,6 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Recarregue a página para tentar novamente ou entre em contato com o suporte $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Feche e reabra o pop-up para tentar novamente ou entre em contato com o suporte $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "A MetaMask encontrou um erro",
     "description": "Title of generic error page"
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 58d7f6ea8718..ebf2af88c186 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -686,10 +686,6 @@
     "message": "Código: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Detalhes do erro",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorMessage": {
     "message": "Mensagem: $1",
     "description": "Displayed error message for debugging purposes. $1 is the error message"
@@ -698,14 +694,6 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Recarregue a página para tentar novamente ou entre em contato com o suporte $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Feche e reabra o pop-up para tentar novamente ou entre em contato com o suporte $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "A MetaMask encontrou um erro",
     "description": "Title of generic error page"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index e56afc418785..9462d9c6eb4a 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Код: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Сведения об ошибке",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Ошибка при получении списка безопасных блокчейнов. Продолжайте с осторожностью."
   },
@@ -1711,14 +1707,6 @@
     "message": "Код: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Повторите попытку, перезагрузив страницу, или обратитесь в поддержку $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Повторите попытку, закрыв и вновь открыв всплывающее окно, или обратитесь в поддержку $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask обнаружил ошибку",
     "description": "Title of generic error page"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index af56d958c313..41612a6ce177 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Code: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Mga Detalye ng Error",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "May error habang kinukuha ang ligtas na chain list, mangyaring magpatuloy nang may pag-iingat."
   },
@@ -1711,14 +1707,6 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Subukang muling i-reload ang page, o kontakin ang support $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Subukan muli sa pamamagitan ng pagsasara o muling pagbubukas ng pop-up, kontakin ang support $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "Nagkaroon ng error sa MetaMask",
     "description": "Title of generic error page"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 6732513395d8..f11cc0d17523 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Kod: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Hata ayrıntıları",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Güvenli zincir listesi alınırken hata oluştu, lütfen dikkatli bir şekilde devam edin."
   },
@@ -1711,14 +1707,6 @@
     "message": "Kod: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Sayfayı yeniden yükleyerek tekrar deneyin veya $1 destek bölümümüze ulaşın.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Açılır pencereyi kapatarak ve yeniden açarak tekrar deneyin $1 destek bölümümüze ulaşın.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask bir hata ile karşılaştı",
     "description": "Title of generic error page"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 9f6ff5119366..dd518df1bf22 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1696,10 +1696,6 @@
     "message": "Mã: $1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "Chi tiết về lỗi",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "Lỗi khi lấy danh sách chuỗi an toàn, vui lòng tiếp tục một cách thận trọng."
   },
@@ -1711,14 +1707,6 @@
     "message": "Mã: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "Hãy thử lại bằng cách tải lại trang hoặc liên hệ với bộ phận hỗ trợ $1.",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "Hãy thử lại bằng cách đóng và mở lại cửa sổ bật lên hoặc liên hệ với bộ phận hỗ trợ $1.",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask đã gặp lỗi",
     "description": "Title of generic error page"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index eef758dacdad..818f1ffdb82b 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1696,10 +1696,6 @@
     "message": "代码：$1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "错误详情",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorGettingSafeChainList": {
     "message": "获取安全链列表时出错，请谨慎继续。"
   },
@@ -1711,14 +1707,6 @@
     "message": "代码：$1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "通过重新加载页面再试一次，或联系支持团队 $1。",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "通过关闭并重新打开弹出窗口再试一次，或联系支持团队 $1。",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask 遇到了一个错误",
     "description": "Title of generic error page"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 7a7fdb68cf1f..29953f67c941 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -425,10 +425,6 @@
     "message": "代碼：$1",
     "description": "Displayed error code for debugging purposes. $1 is the error code"
   },
-  "errorDetails": {
-    "message": "錯誤詳細資訊",
-    "description": "Title for collapsible section that displays error details for debugging purposes"
-  },
   "errorMessage": {
     "message": "訊息：$1",
     "description": "Displayed error message for debugging purposes. $1 is the error message"
@@ -437,14 +433,6 @@
     "message": "代碼：$1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
-  "errorPageMessage": {
-    "message": "重新整理頁面然後再試一次，或從$1聯絡我們尋求支援。",
-    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
-  "errorPagePopupMessage": {
-    "message": "重新開啟彈跳視窗然後再試一次，或從$1聯絡我們尋求支援。",
-    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
-  },
   "errorPageTitle": {
     "message": "MetaMask 遭遇錯誤",
     "description": "Title of generic error page"
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 6e041ea3d71b..817d1e102bff 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -56,6 +56,8 @@
   "sourcify.dev",
   "start.metamask.io",
   "static.cx.metamask.io",
+  "support.metamask.io",
+  "support.metamask-institutional.io",
   "swap.api.cx.metamask.io",
   "test.metamask-phishing.io",
   "token.api.cx.metamask.io",
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 4096d04b11d6..103a24c2463d 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -158,6 +158,10 @@ export type MetaMetricsEventOptions = {
    * as not conforming to our schema.
    */
   matomoEvent?: boolean;
+  /**
+   * Values that can used in the "properties" tracking object as keys,
+   */
+  contextPropsIntoEventProperties?: string | string[];
 };
 
 export type MetaMetricsEventFragment = {
diff --git a/shared/modules/i18n.test.ts b/shared/modules/i18n.test.ts
index 8452ef48238c..7a2f49bd9f68 100644
--- a/shared/modules/i18n.test.ts
+++ b/shared/modules/i18n.test.ts
@@ -109,7 +109,21 @@ describe('I18N Module', () => {
             );
           });
 
-          it('throws if test env set', () => {
+          it('throws if IN_TEST is set true', () => {
+            expect(() =>
+              getMessage(
+                FALLBACK_LOCALE,
+                {} as unknown as I18NMessageDict,
+                keyMock,
+              ),
+            ).toThrow(
+              `Unable to find value of key "${keyMock}" for locale "${FALLBACK_LOCALE}"`,
+            );
+          });
+
+          it('throws if ENABLE_SETTINGS_PAGE_DEV_OPTIONS is set true', () => {
+            process.env.IN_TEST = String(false);
+            process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS = String(true);
             expect(() =>
               getMessage(
                 FALLBACK_LOCALE,
diff --git a/shared/modules/i18n.ts b/shared/modules/i18n.ts
index d19cfa4b3b11..b5c22c869b54 100644
--- a/shared/modules/i18n.ts
+++ b/shared/modules/i18n.ts
@@ -177,7 +177,7 @@ function missingKeyError(
     onError?.(error);
     log.error(error);
 
-    if (process.env.IN_TEST) {
+    if (process.env.IN_TEST || process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS) {
       throw error;
     }
   }
@@ -188,7 +188,6 @@ function missingKeyError(
 
   warned[localeCode] = warned[localeCode] ?? {};
   warned[localeCode][key] = true;
-
   log.warn(
     `Translator - Unable to find value of key "${key}" for locale "${localeCode}"`,
   );
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 184787b07836..80e5499447d7 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -46,7 +46,13 @@
     "mostRecentOverviewPage": "/mostRecentOverviewPage"
   },
   "localeMessages": {
-    "currentLocale": "en"
+    "currentLocale": "en",
+    "current": {
+      "user": "user"
+    },
+    "en": {
+      "user": "user"
+    }
   },
   "metamask": {
     "use4ByteResolution": true,
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index c3705c1ebf6c..1c3f53b30224 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -55,7 +55,7 @@ const convertETHToHexGwei = (eth) => convertToHexValue(eth * 10 ** 18);
 /**
  *
  * @param {object} options
- * @param {(fixtures: Fixtures) => Promise<void>} testSuite
+ * @param {({driver: Driver, mockedEndpoint: MockedEndpoint}: TestSuiteArguments) => Promise<void>} testSuite
  */
 async function withFixtures(options, testSuite) {
   const {
@@ -1308,6 +1308,8 @@ async function openMenuSafe(driver) {
   }
 }
 
+const sentryRegEx = /^https:\/\/sentry\.io\/api\/\d+\/envelope/gu;
+
 module.exports = {
   DAPP_HOST_ADDRESS,
   DAPP_URL,
@@ -1379,4 +1381,5 @@ module.exports = {
   getSelectedAccountAddress,
   tempToggleSettingRedesignedConfirmations,
   openMenuSafe,
+  sentryRegEx,
 };
diff --git a/test/e2e/page-objects/pages/developer-options-page.ts b/test/e2e/page-objects/pages/developer-options-page.ts
new file mode 100644
index 000000000000..c15f6c767a82
--- /dev/null
+++ b/test/e2e/page-objects/pages/developer-options-page.ts
@@ -0,0 +1,38 @@
+import { Driver } from '../../webdriver/driver';
+
+class DevelopOptions {
+  private readonly driver: Driver;
+
+  // Locators
+  private readonly generatePageCrashButton: string =
+    '[data-testid="developer-options-generate-page-crash-button"]';
+
+  private readonly developOptionsPageTitle: object = {
+    text: 'Developer Options',
+    css: 'h4',
+  };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForSelector(this.developOptionsPageTitle);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Developer options page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Developer option page is loaded');
+  }
+
+  async clickGenerateCrashButton(): Promise<void> {
+    console.log('Generate a page crash in Developer option page');
+    await this.driver.clickElement(this.generatePageCrashButton);
+  }
+}
+
+export default DevelopOptions;
diff --git a/test/e2e/page-objects/pages/error-page.ts b/test/e2e/page-objects/pages/error-page.ts
new file mode 100644
index 000000000000..76acacdcf9dd
--- /dev/null
+++ b/test/e2e/page-objects/pages/error-page.ts
@@ -0,0 +1,95 @@
+import { Driver } from '../../webdriver/driver';
+import HeaderNavbar from './header-navbar';
+import SettingsPage from './settings-page';
+import DevelopOptionsPage from './developer-options-page';
+
+const FEEDBACK_MESSAGE =
+  'Message: Unable to find value of key "developerOptions" for locale "en"';
+
+class ErrorPage {
+  private readonly driver: Driver;
+
+  // Locators
+  private readonly errorPageTitle: object = {
+    text: 'MetaMask encountered an error',
+    css: 'h3',
+  };
+
+  private readonly errorMessage = '[data-testid="error-page-error-message"]';
+
+  private readonly sendReportToSentryButton =
+    '[data-testid="error-page-describe-what-happened-button"]';
+
+  private readonly sentryReportForm =
+    '[data-testid="error-page-sentry-feedback-modal"]';
+
+  private readonly contactSupportButton =
+    '[data-testid="error-page-contact-support-button"]';
+
+  private readonly sentryFeedbackTextarea =
+    '[data-testid="error-page-sentry-feedback-textarea"]';
+
+  private readonly sentryFeedbackSubmitButton =
+    '[data-testid="error-page-sentry-feedback-submit-button"]';
+
+  private readonly sentryFeedbackSuccessModal =
+    '[data-testid="error-page-sentry-feedback-success-modal"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForSelector(this.errorPageTitle);
+    } catch (e) {
+      console.log('Timeout while waiting for Error page to be loaded', e);
+      throw e;
+    }
+    console.log('Error page is loaded');
+  }
+
+  async triggerPageCrash(): Promise<void> {
+    const headerNavbar = new HeaderNavbar(this.driver);
+    await headerNavbar.openSettingsPage();
+    const settingsPage = new SettingsPage(this.driver);
+    await settingsPage.check_pageIsLoaded();
+    await settingsPage.goToDevelopOptionSettings();
+
+    const developOptionsPage = new DevelopOptionsPage(this.driver);
+    await developOptionsPage.check_pageIsLoaded();
+    await developOptionsPage.clickGenerateCrashButton();
+  }
+
+  async validate_errorMessage(): Promise<void> {
+    await this.driver.waitForSelector({
+      text: `Message: Unable to find value of key "developerOptions" for locale "en"`,
+      css: this.errorMessage,
+    });
+  }
+
+  async submitToSentryUserFeedbackForm(): Promise<void> {
+    console.log(`Open sentry user feedback form in error page`);
+    await this.driver.clickElement(this.sendReportToSentryButton);
+    await this.driver.waitForSelector(this.sentryReportForm);
+    await this.driver.fill(this.sentryFeedbackTextarea, FEEDBACK_MESSAGE);
+    await this.driver.clickElementAndWaitToDisappear(
+      this.sentryFeedbackSubmitButton,
+    );
+  }
+
+  async contactAndValidateMetaMaskSupport(): Promise<void> {
+    console.log(`Contact metamask support form in a separate page`);
+    await this.driver.waitUntilXWindowHandles(1);
+    await this.driver.clickElement(this.contactSupportButton);
+    // metamask, help page
+    await this.driver.waitUntilXWindowHandles(2);
+  }
+
+  async waitForSentrySuccessModal(): Promise<void> {
+    await this.driver.waitForSelector(this.sentryFeedbackSuccessModal);
+    await this.driver.assertElementNotPresent(this.sentryFeedbackSuccessModal);
+  }
+}
+
+export default ErrorPage;
diff --git a/test/e2e/page-objects/pages/settings-page.ts b/test/e2e/page-objects/pages/settings-page.ts
index 547f9e43a34e..c029e34efc7e 100644
--- a/test/e2e/page-objects/pages/settings-page.ts
+++ b/test/e2e/page-objects/pages/settings-page.ts
@@ -9,6 +9,11 @@ class SettingsPage {
     css: '.tab-bar__tab__content__title',
   };
 
+  private readonly developerOptionsButton: object = {
+    text: 'Developer Options',
+    css: '.tab-bar__tab__content__title',
+  };
+
   private readonly settingsPageTitle: object = {
     text: 'Settings',
     css: 'h3',
@@ -32,6 +37,11 @@ class SettingsPage {
     console.log('Navigating to Experimental Settings page');
     await this.driver.clickElement(this.experimentalSettingsButton);
   }
+
+  async goToDevelopOptionSettings(): Promise<void> {
+    console.log('Navigating to Develop options page');
+    await this.driver.clickElement(this.developerOptionsButton);
+  }
 }
 
 export default SettingsPage;
diff --git a/test/e2e/tests/metrics/developer-options-sentry.spec.ts b/test/e2e/tests/metrics/developer-options-sentry.spec.ts
new file mode 100644
index 000000000000..3c20f931f302
--- /dev/null
+++ b/test/e2e/tests/metrics/developer-options-sentry.spec.ts
@@ -0,0 +1,88 @@
+import { Suite } from 'mocha';
+import { MockttpServer } from 'mockttp';
+import { withFixtures, sentryRegEx } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { Driver } from '../../webdriver/driver';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import SettingsPage from '../../page-objects/pages/settings-page';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import DevelopOptions from '../../page-objects/pages/developer-options-page';
+import ErrorPage from '../../page-objects/pages/error-page';
+
+const triggerCrash = async (driver: Driver): Promise<void> => {
+  const headerNavbar = new HeaderNavbar(driver);
+  await headerNavbar.openSettingsPage();
+  const settingsPage = new SettingsPage(driver);
+  await settingsPage.check_pageIsLoaded();
+  await settingsPage.goToDevelopOptionSettings();
+
+  const developOptionsPage = new DevelopOptions(driver);
+  await developOptionsPage.check_pageIsLoaded();
+  await developOptionsPage.clickGenerateCrashButton();
+};
+
+async function mockSentryError(mockServer: MockttpServer) {
+  return [
+    await mockServer
+      .forPost(sentryRegEx)
+      .withBodyIncluding('feedback')
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          json: {},
+        };
+      }),
+  ];
+}
+
+describe('Developer Options - Sentry', function (this: Suite) {
+  it('gives option to cause a page crash and provides sentry form to report', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-id',
+            participateInMetaMetrics: true,
+          })
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockSentryError,
+        ignoredConsoleErrors: [
+          'Error#1: Unable to find value of key "developerOptions" for locale "en"',
+          'React will try to recreate this component tree from scratch using the error boundary you provided, Index.',
+        ],
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await loginWithBalanceValidation(driver);
+        await triggerCrash(driver);
+        const errorPage = new ErrorPage(driver);
+        await errorPage.check_pageIsLoaded();
+        await errorPage.validate_errorMessage();
+        await errorPage.submitToSentryUserFeedbackForm();
+        await errorPage.waitForSentrySuccessModal();
+      },
+    );
+  });
+
+  it('gives option to cause a page crash and offer contact support option', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+        ignoredConsoleErrors: [
+          'Error#1: Unable to find value of key "developerOptions" for locale "en"',
+          'React will try to recreate this component tree from scratch using the error boundary you provided, Index.',
+        ],
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await loginWithBalanceValidation(driver);
+        await triggerCrash(driver);
+
+        const errorPage = new ErrorPage(driver);
+        await errorPage.check_pageIsLoaded();
+
+        await errorPage.contactAndValidateMetaMaskSupport();
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index 3b003b044b5a..d4c27a87aba6 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -13,6 +13,7 @@ const {
   convertToHexValue,
   logInWithBalanceValidation,
   withFixtures,
+  sentryRegEx,
 } = require('../../helpers');
 const { PAGES } = require('../../webdriver/driver');
 
@@ -181,8 +182,6 @@ function getMissingProperties(complete, object) {
 }
 
 describe('Sentry errors', function () {
-  const sentryRegEx = /^https:\/\/sentry\.io\/api\/\d+\/envelope/gu;
-
   const migrationError =
     process.env.SELENIUM_BROWSER === Browser.CHROME
       ? `"type":"TypeError","value":"Cannot read properties of undefined (reading 'version')`
diff --git a/ui/ducks/locale/locale.js b/ui/ducks/locale/locale.js
deleted file mode 100644
index 5118a749ab58..000000000000
--- a/ui/ducks/locale/locale.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { createSelector } from 'reselect';
-import * as actionConstants from '../../store/actionConstants';
-
-export default function reduceLocaleMessages(state = {}, { type, payload }) {
-  switch (type) {
-    case actionConstants.SET_CURRENT_LOCALE:
-      return {
-        ...state,
-        current: payload.messages,
-        currentLocale: payload.locale,
-      };
-    default:
-      return state;
-  }
-}
-
-/**
- * This selector returns a code from file://./../../../app/_locales/index.json.
- *
- * NOT SAFE FOR INTL API USE. Use getIntlLocale instead for that.
- *
- * @param state
- * @returns {string} the user's selected locale.
- * These codes are not safe to use with the Intl API.
- */
-export const getCurrentLocale = (state) => state.localeMessages.currentLocale;
-
-/**
- * This selector returns a
- * [BCP 47 Language Tag](https://en.wikipedia.org/wiki/IETF_language_tag)
- * for use with the Intl API.
- *
- * @returns {Intl.UnicodeBCP47LocaleIdentifier} the user's selected locale.
- */
-export const getIntlLocale = createSelector(
-  getCurrentLocale,
-  (locale) => Intl.getCanonicalLocales(locale?.replace(/_/gu, '-'))[0],
-);
-
-export const getCurrentLocaleMessages = (state) => state.localeMessages.current;
-
-export const getEnLocaleMessages = (state) => state.localeMessages.en;
diff --git a/ui/ducks/locale/locale.test.ts b/ui/ducks/locale/locale.test.ts
index 37fc1f99e29a..67627bb73423 100644
--- a/ui/ducks/locale/locale.test.ts
+++ b/ui/ducks/locale/locale.test.ts
@@ -1,32 +1,80 @@
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import locales from '../../../app/_locales/index.json';
-import { getIntlLocale } from './locale';
+import testData from '../../../test/data/mock-state.json';
 
+import {
+  getCurrentLocale,
+  getIntlLocale,
+  getCurrentLocaleMessages,
+  getEnLocaleMessages,
+} from './locale';
+
+// Mock state creation functions
 const createMockStateWithLocale = (locale: string) => ({
   localeMessages: { currentLocale: locale },
 });
 
-describe('getIntlLocale', () => {
-  it('returns the canonical BCP 47 language tag for the currently selected locale', () => {
-    const mockState = createMockStateWithLocale('ab-cd');
+describe('Locale Selectors', () => {
+  describe('getCurrentLocale', () => {
+    it('returns the current locale from the state', () => {
+      expect(getCurrentLocale(testData)).toBe('en');
+    });
 
-    expect(getIntlLocale(mockState)).toBe('ab-CD');
+    it('returns undefined if no current locale is set', () => {
+      const newAppState = {
+        ...testData,
+        localeMessages: {
+          currentLocale: undefined,
+        },
+      };
+      expect(getCurrentLocale(newAppState)).toBeUndefined();
+    });
   });
 
-  it('throws an error if locale cannot be made into BCP 47 language tag', () => {
-    const mockState = createMockStateWithLocale('xxxinvalid-locale');
+  describe('getIntlLocale', () => {
+    it('returns the canonical BCP 47 language tag for the currently selected locale', () => {
+      const mockState = createMockStateWithLocale('en_US');
+      expect(getIntlLocale(mockState)).toBe('en-US');
+    });
 
-    expect(() => getIntlLocale(mockState)).toThrow();
+    locales.forEach((locale: { code: string; name: string }) => {
+      it(`handles supported locale - "${locale.code}"`, () => {
+        const mockState = createMockStateWithLocale(locale.code);
+        expect(() => getIntlLocale(mockState)).not.toThrow();
+      });
+    });
   });
 
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each(locales)(
-    'handles all supported locales – "%s"',
-    (locale: { code: string; name: string }) => {
-      const mockState = createMockStateWithLocale(locale.code);
+  describe('getCurrentLocaleMessages', () => {
+    it('returns the current locale messages from the state', () => {
+      expect(getCurrentLocaleMessages(testData)).toEqual({ user: 'user' });
+    });
+
+    it('returns undefined if there are no current locale messages', () => {
+      const newAppState = {
+        ...testData,
+        localeMessages: {
+          current: undefined,
+        },
+      };
+      expect(getCurrentLocaleMessages(newAppState)).toEqual(undefined);
+    });
+  });
 
-      expect(() => getIntlLocale(mockState)).not.toThrow();
-    },
-  );
+  describe('getEnLocaleMessages', () => {
+    it('returns the English locale messages from the state', () => {
+      expect(getEnLocaleMessages(testData)).toEqual({ user: 'user' });
+    });
+
+    it('returns undefined if there are no English locale messages', () => {
+      const newAppState = {
+        ...testData,
+        localeMessages: {
+          en: undefined,
+        },
+      };
+      expect(getEnLocaleMessages(newAppState)).toBeUndefined();
+    });
+  });
 });
diff --git a/ui/ducks/locale/locale.ts b/ui/ducks/locale/locale.ts
new file mode 100644
index 000000000000..2ca0cbaac4dc
--- /dev/null
+++ b/ui/ducks/locale/locale.ts
@@ -0,0 +1,108 @@
+import { createSelector } from 'reselect';
+import { Action } from 'redux'; // Import types for actions
+import * as actionConstants from '../../store/actionConstants';
+import { FALLBACK_LOCALE } from '../../../shared/modules/i18n';
+
+/**
+ * Type for the locale messages part of the state
+ */
+type LocaleMessagesState = {
+  current?: { [key: string]: string }; // Messages for the current locale
+  currentLocale?: string; // User's selected locale (unsafe for Intl API)
+  en?: { [key: string]: string }; // English locale messages
+};
+
+/**
+ * Payload for the SET_CURRENT_LOCALE action
+ */
+type SetCurrentLocaleAction = Action & {
+  type: typeof actionConstants.SET_CURRENT_LOCALE;
+  payload: {
+    messages: { [key: string]: string };
+    locale: string;
+  };
+};
+
+/**
+ * Type for actions that can be handled by reduceLocaleMessages
+ */
+type LocaleMessagesActions = SetCurrentLocaleAction;
+
+/**
+ * Initial state for localeMessages reducer
+ */
+const initialState: LocaleMessagesState = {};
+
+/**
+ * Reducer for localeMessages
+ *
+ * @param state - The current state
+ * @param action - The action being dispatched
+ * @returns The updated locale messages state
+ */
+export default function reduceLocaleMessages(
+  // eslint-disable-next-line @typescript-eslint/default-param-last
+  state: LocaleMessagesState = initialState,
+  action: LocaleMessagesActions,
+): LocaleMessagesState {
+  switch (action.type) {
+    case actionConstants.SET_CURRENT_LOCALE:
+      return {
+        ...state,
+        current: action.payload.messages,
+        currentLocale: action.payload.locale,
+      };
+    default:
+      return state;
+  }
+}
+
+/**
+ * Type for the overall Redux state
+ */
+type AppState = {
+  localeMessages: LocaleMessagesState;
+};
+
+/**
+ * This selector returns a code from file://./../../../app/_locales/index.json.
+ * NOT SAFE FOR INTL API USE. Use getIntlLocale instead for that.
+ *
+ * @param state - The overall state
+ * @returns The user's selected locale
+ */
+export const getCurrentLocale = (state: AppState): string | undefined =>
+  state.localeMessages.currentLocale;
+
+/**
+ * This selector returns a BCP 47 Language Tag for use with the Intl API.
+ *
+ * @returns The user's selected locale in BCP 47 format
+ */
+export const getIntlLocale = createSelector(
+  getCurrentLocale,
+  (locale): string =>
+    Intl.getCanonicalLocales(
+      locale ? locale.replace(/_/gu, '-') : FALLBACK_LOCALE,
+    )[0],
+);
+
+/**
+ * This selector returns the current locale messages.
+ *
+ * @param state - The overall state
+ * @returns The current locale's messages
+ */
+export const getCurrentLocaleMessages = (
+  state: AppState,
+): Record<string, string> | undefined => state.localeMessages.current;
+
+/**
+ * This selector returns the English locale messages.
+ *
+ * @param state - The overall state
+ * @returns The English locale's messages
+ */
+export const getEnLocaleMessages = (
+  state: AppState,
+): Record<string, string> | undefined => state.localeMessages.en;
diff --git a/ui/pages/error-page/error-component.test.tsx b/ui/pages/error-page/error-component.test.tsx
new file mode 100644
index 000000000000..16188c30881a
--- /dev/null
+++ b/ui/pages/error-page/error-component.test.tsx
@@ -0,0 +1,192 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import '@testing-library/jest-dom/extend-expect';
+import browser from 'webextension-polyfill';
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import { useI18nContext } from '../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../contexts/metametrics';
+import { getParticipateInMetaMetrics } from '../../selectors';
+import { getMessage } from '../../helpers/utils/i18n-helper';
+// eslint-disable-next-line import/no-restricted-paths
+import messages from '../../../app/_locales/en/messages.json';
+import { SUPPORT_REQUEST_LINK } from '../../helpers/constants/common';
+import {
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
+import ErrorPage from './error-page.component';
+
+jest.mock('../../hooks/useI18nContext', () => ({
+  useI18nContext: jest.fn(),
+}));
+
+jest.mock('webextension-polyfill', () => ({
+  runtime: {
+    reload: jest.fn(),
+  },
+}));
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+describe('ErrorPage', () => {
+  const useSelectorMock = useSelector as jest.Mock;
+  const mockTrackEvent = jest.fn();
+  const MockError = new Error(
+    "Cannot read properties of undefined (reading 'message')",
+  ) as Error & { code?: string };
+  MockError.code = '500';
+
+  const mockI18nContext = jest
+    .fn()
+    .mockReturnValue((key: string, variables: string[]) =>
+      getMessage('en', messages, key, variables),
+    );
+
+  beforeEach(() => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getParticipateInMetaMetrics) {
+        return true;
+      }
+      return undefined;
+    });
+    (useI18nContext as jest.Mock).mockImplementation(mockI18nContext);
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('should render the error message, code, and name if provided', () => {
+    const { getByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={MockError} />
+      </MetaMetricsContext.Provider>,
+    );
+
+    expect(
+      getByTestId('error-page-error-message').textContent,
+    ).toMatchInlineSnapshot(
+      `"Message: Cannot read properties of undefined (reading 'message')"`,
+    );
+    expect(
+      getByTestId('error-page-error-code').textContent,
+    ).toMatchInlineSnapshot(`"Code: 500"`);
+    expect(
+      getByTestId('error-page-error-name').textContent,
+    ).toMatchInlineSnapshot(`"Code: Error"`);
+  });
+
+  it('should not render error details if no error information is provided', () => {
+    const error = {};
+
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={error} />
+      </MetaMetricsContext.Provider>,
+    );
+
+    expect(queryByTestId('error-page-error-message')).toBeNull();
+    expect(queryByTestId('error-page-error-code')).toBeNull();
+    expect(queryByTestId('error-page-error-name')).toBeNull();
+    expect(queryByTestId('error-page-error-stack')).toBeNull();
+  });
+
+  it('should render sentry user feedback form and submit sentry report successfully when metrics is opted in', () => {
+    const { getByTestId, queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={MockError} />
+      </MetaMetricsContext.Provider>,
+    );
+    const describeButton = getByTestId(
+      'error-page-describe-what-happened-button',
+    );
+    fireEvent.click(describeButton);
+    expect(
+      queryByTestId('error-page-sentry-feedback-modal'),
+    ).toBeInTheDocument();
+    const textarea = getByTestId('error-page-sentry-feedback-textarea');
+    fireEvent.change(textarea, {
+      target: { value: 'Something went wrong on develop option page' },
+    });
+    const submitButton = getByTestId(
+      'error-page-sentry-feedback-submit-button',
+    );
+    fireEvent.click(submitButton);
+    expect(
+      queryByTestId('error-page-sentry-feedback-modal'),
+    ).not.toBeInTheDocument();
+    expect(
+      queryByTestId('error-page-sentry-feedback-success-modal'),
+    ).toBeInTheDocument();
+    jest.advanceTimersByTime(5000);
+    expect(
+      queryByTestId('error-page-sentry-feedback-modal'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('should render not sentry user feedback option when metrics is not opted in', () => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getParticipateInMetaMetrics) {
+        return false;
+      }
+      return undefined;
+    });
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={MockError} />
+      </MetaMetricsContext.Provider>,
+    );
+    const describeButton = queryByTestId(
+      'error-page-describe-what-happened-button',
+    );
+
+    expect(describeButton).toBeNull();
+  });
+
+  it('should reload the extension when the "Try Again" button is clicked', () => {
+    const { getByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={MockError} />
+      </MetaMetricsContext.Provider>,
+    );
+    const tryAgainButton = getByTestId('error-page-try-again-button');
+    fireEvent.click(tryAgainButton);
+    expect(browser.runtime.reload).toHaveBeenCalled();
+  });
+
+  it('should open the support link and track the MetaMetrics event when the "Contact Support" button is clicked', () => {
+    window.open = jest.fn();
+
+    const { getByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <ErrorPage error={MockError} />
+      </MetaMetricsContext.Provider>,
+    );
+
+    const contactSupportButton = getByTestId(
+      'error-page-contact-support-button',
+    );
+    fireEvent.click(contactSupportButton);
+
+    expect(window.open).toHaveBeenCalledWith(SUPPORT_REQUEST_LINK, '_blank');
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      {
+        category: MetaMetricsEventCategory.Error,
+        event: MetaMetricsEventName.SupportLinkClicked,
+        properties: {
+          url: SUPPORT_REQUEST_LINK,
+        },
+      },
+      {
+        contextPropsIntoEventProperties: [MetaMetricsContextProp.PageTitle],
+      },
+    );
+  });
+});
diff --git a/ui/pages/error-page/error-page.component.tsx b/ui/pages/error-page/error-page.component.tsx
new file mode 100644
index 000000000000..9a094057dcc0
--- /dev/null
+++ b/ui/pages/error-page/error-page.component.tsx
@@ -0,0 +1,312 @@
+import React, { useEffect, useContext, useState } from 'react';
+import { useSelector } from 'react-redux';
+import * as Sentry from '@sentry/browser';
+import browser from 'webextension-polyfill';
+import {
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
+
+import { getParticipateInMetaMetrics } from '../../selectors';
+import { MetaMetricsContext } from '../../contexts/metametrics';
+import { useI18nContext } from '../../hooks/useI18nContext';
+import {
+  BannerAlert,
+  Box,
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+  Button,
+  ButtonVariant,
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+} from '../../components/component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  BorderRadius,
+  Display,
+  FlexDirection,
+  IconColor,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../helpers/constants/design-system';
+
+import { SUPPORT_REQUEST_LINK } from '../../helpers/constants/common';
+
+import { Textarea } from '../../components/component-library/textarea/textarea';
+import { TextareaResize } from '../../components/component-library/textarea/textarea.types';
+import { ButtonSize } from '../../components/component-library/button/button.types';
+
+type ErrorPageProps = {
+  error: {
+    message?: string;
+    code?: string;
+    name?: string;
+    stack?: string;
+  };
+};
+
+const ErrorPage: React.FC<ErrorPageProps> = ({ error }) => {
+  const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
+
+  const [feedbackMessage, setFeedbackMessage] = useState('');
+  const [isFeedbackModalOpen, setIsFeedbackModalOpen] = useState(false);
+  const [isSuccessModalShown, setIsSuccessModalShown] = useState(false);
+
+  const handleClickDescribeButton = (): void => {
+    setIsFeedbackModalOpen(true);
+  };
+
+  const handleCloseDescribeModal = (): void => {
+    setIsFeedbackModalOpen(false);
+  };
+
+  const handleSubmitFeedback = (e: React.MouseEvent<HTMLElement>) => {
+    e.preventDefault();
+    const eventId = Sentry.lastEventId();
+
+    Sentry.captureFeedback({
+      message: feedbackMessage,
+      associatedEventId: eventId,
+    });
+    handleCloseDescribeModal();
+    setIsSuccessModalShown(true);
+  };
+
+  useEffect(() => {
+    if (isSuccessModalShown) {
+      const timeoutId = setTimeout(() => {
+        setIsSuccessModalShown(false); // Close the modal after 5 seconds
+      }, 5000);
+
+      // Cleanup function to clear timeout if the component unmounts or state changes
+      return () => clearTimeout(timeoutId);
+    }
+    return undefined;
+  }, [isSuccessModalShown]);
+
+  return (
+    <section className="error-page">
+      <section className="error-page__inner-wrapper">
+        <Box
+          className="error-page__header"
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          alignItems={AlignItems.center}
+        >
+          <Icon
+            name={IconName.Danger}
+            size={IconSize.Xl}
+            color={IconColor.warningDefault}
+          />
+          <Text variant={TextVariant.headingMd} marginBottom={4}>
+            {t('errorPageTitle')}
+          </Text>
+        </Box>
+
+        <div className="error-page__banner-wrapper">
+          <BannerAlert marginBottom={4}>{t('errorPageInfo')}</BannerAlert>
+        </div>
+
+        <Text variant={TextVariant.bodyMd}>{t('errorPageMessageTitle')}</Text>
+
+        <Box
+          borderRadius={BorderRadius.LG}
+          marginBottom={2}
+          marginTop={2}
+          backgroundColor={BackgroundColor.errorMuted}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          padding={2}
+          className="error-page__error-message-wrapper"
+        >
+          {error.message ? (
+            <Text
+              variant={TextVariant.bodyXs}
+              marginBottom={2}
+              data-testid="error-page-error-message"
+            >
+              {t('errorMessage', [error.message])}
+            </Text>
+          ) : null}
+          {error.code ? (
+            <Text
+              variant={TextVariant.bodyXs}
+              marginBottom={2}
+              data-testid="error-page-error-code"
+            >
+              {t('errorCode', [error.code])}
+            </Text>
+          ) : null}
+          {error.name ? (
+            <Text
+              variant={TextVariant.bodyXs}
+              marginBottom={2}
+              data-testid="error-page-error-name"
+            >
+              {t('errorName', [error.name])}
+            </Text>
+          ) : null}
+          {error.stack ? (
+            <>
+              <Text variant={TextVariant.bodyXs} marginBottom={2}>
+                {t('errorStack')}
+              </Text>
+              <pre
+                className="error-page__stack"
+                data-testid="error-page-error-stack"
+              >
+                {error.stack}
+              </pre>
+            </>
+          ) : null}
+        </Box>
+
+        {isFeedbackModalOpen && (
+          <Modal
+            isOpen={isFeedbackModalOpen}
+            onClose={handleCloseDescribeModal}
+            data-testid="error-page-sentry-feedback-modal"
+          >
+            <ModalOverlay />
+            <ModalContent>
+              <ModalHeader onClose={handleCloseDescribeModal}>
+                {t('errorPageSentryFormTitle')}
+              </ModalHeader>
+              <ModalBody>
+                <Textarea
+                  resize={TextareaResize.Vertical}
+                  required
+                  autoFocus
+                  cols={32}
+                  rows={6}
+                  placeholder={t('errorPageSentryMessagePlaceholder')}
+                  onChange={(e) => setFeedbackMessage(e.target.value)}
+                  data-testid="error-page-sentry-feedback-textarea"
+                />
+              </ModalBody>
+              <ModalFooter>
+                <Box display={Display.Flex} gap={4}>
+                  <Button
+                    variant={ButtonVariant.Secondary}
+                    width={BlockSize.Half}
+                    onClick={handleCloseDescribeModal}
+                    size={ButtonSize.Md}
+                  >
+                    {t('cancel')}
+                  </Button>
+                  <Button
+                    variant={ButtonVariant.Primary}
+                    width={BlockSize.Half}
+                    onClick={handleSubmitFeedback}
+                    size={ButtonSize.Md}
+                    data-testid="error-page-sentry-feedback-submit-button"
+                  >
+                    {t('submit')}
+                  </Button>
+                </Box>
+              </ModalFooter>
+            </ModalContent>
+          </Modal>
+        )}
+        {isSuccessModalShown && (
+          <Modal
+            isOpen={isSuccessModalShown}
+            onClose={() => setIsSuccessModalShown(false)}
+            data-testid="error-page-sentry-feedback-success-modal"
+          >
+            <ModalOverlay />
+            <ModalContent>
+              <ModalBody
+                display={Display.Flex}
+                flexDirection={FlexDirection.Row}
+                alignItems={AlignItems.center}
+                justifyContent={JustifyContent.center}
+                gap={4}
+              >
+                <Icon
+                  name={IconName.CheckBold}
+                  color={IconColor.successDefault}
+                  size={IconSize.Md}
+                  marginRight={2}
+                />
+                <Text
+                  variant={TextVariant.bodyMdMedium}
+                  color={TextColor.successDefault}
+                >
+                  {t('errorPageSentrySuccessMessageText')}
+                </Text>
+              </ModalBody>
+            </ModalContent>
+          </Modal>
+        )}
+        <Box
+          width={BlockSize.Full}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          alignItems={AlignItems.center}
+          justifyContent={JustifyContent.center}
+          marginTop={4}
+        >
+          {isMetaMetricsEnabled && (
+            <Button
+              className="error-page__report-to-sentry-button"
+              marginBottom={2}
+              block
+              data-testid="error-page-describe-what-happened-button"
+              onClick={handleClickDescribeButton}
+            >
+              {t('errorPageDescribeUsWhatHappened')}
+            </Button>
+          )}
+          <Button
+            marginBottom={2}
+            variant={ButtonVariant.Secondary}
+            block
+            data-testid="error-page-contact-support-button"
+            onClick={() => {
+              window.open(SUPPORT_REQUEST_LINK, '_blank');
+              trackEvent(
+                {
+                  category: MetaMetricsEventCategory.Error,
+                  event: MetaMetricsEventName.SupportLinkClicked,
+                  properties: {
+                    url: SUPPORT_REQUEST_LINK,
+                  },
+                },
+                {
+                  contextPropsIntoEventProperties: [
+                    MetaMetricsContextProp.PageTitle,
+                  ],
+                },
+              );
+            }}
+          >
+            {t('errorPageContactSupport')}
+          </Button>
+          <Button
+            variant={ButtonVariant.Secondary}
+            block
+            data-testid="error-page-try-again-button"
+            onClick={() => browser.runtime.reload()}
+          >
+            {t('errorPageTryAgain')}
+          </Button>
+        </Box>
+      </section>
+    </section>
+  );
+};
+
+export default ErrorPage;
diff --git a/ui/pages/error-page/index.scss b/ui/pages/error-page/index.scss
new file mode 100644
index 000000000000..b3d734899dd7
--- /dev/null
+++ b/ui/pages/error-page/index.scss
@@ -0,0 +1,41 @@
+@use "design-system";
+
+.error-page {
+  display: flex;
+  flex-flow: column;
+  padding: 16px;
+  height: 100%;
+
+  &__inner-wrapper {
+    @media screen and (min-width: design-system.$screen-md-min) {
+      width: 50%;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+
+  &__stack {
+    max-height: 120px;
+    overflow: auto;
+    font-family: var(--font-family-sans);
+    font-weight: var(--typography-l-body-xs-font-weight);
+    font-size: var(--typography-l-body-xs-font-size);
+  }
+
+  &__link-text {
+    color: var(--color-primary-default);
+  }
+}
+
+// override styles for sentry feedback form
+#sentry-feedback {
+  --font-family: var(--font-family-sans);
+  --inset: auto 20px 20px auto;
+  --input-font-size: 14px;
+  --button-color: var(--color-primary-default);
+  --button-primary-background: var(--color-primary-default);
+  --button-primary-border: var(--color-primary-default);
+  --button-primary-hover-background: var(--color-primary-default);
+  --success-color: var(--color-success-default);
+  --error-color: var(--color-error-default);
+}
diff --git a/ui/pages/error-page/index.ts b/ui/pages/error-page/index.ts
new file mode 100644
index 000000000000..7c868e73cad5
--- /dev/null
+++ b/ui/pages/error-page/index.ts
@@ -0,0 +1 @@
+export { default } from './error-page.component';
diff --git a/ui/pages/error/error.component.js b/ui/pages/error/error.component.js
deleted file mode 100644
index f7ab9c593d40..000000000000
--- a/ui/pages/error/error.component.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import { getEnvironmentType } from '../../../app/scripts/lib/util';
-import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
-import { getErrorMessage } from '../../../shared/modules/error';
-import { SUPPORT_REQUEST_LINK } from '../../helpers/constants/common';
-import {
-  MetaMetricsContextProp,
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../shared/constants/metametrics';
-
-class ErrorPage extends PureComponent {
-  static contextTypes = {
-    t: PropTypes.func.isRequired,
-    trackEvent: PropTypes.func,
-  };
-
-  static propTypes = {
-    error: PropTypes.object.isRequired,
-  };
-
-  renderErrorDetail(content) {
-    return (
-      <li>
-        <p>{content}</p>
-      </li>
-    );
-  }
-
-  renderErrorStack(title, stack) {
-    return (
-      <li>
-        <span>{title}</span>
-        <pre className="error-page__stack">{stack}</pre>
-      </li>
-    );
-  }
-
-  render() {
-    const { error } = this.props;
-    const { t } = this.context;
-
-    const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
-    const supportLink = (
-      <a
-        target="_blank"
-        key="metamaskSupportLink"
-        rel="noopener noreferrer"
-        href={SUPPORT_REQUEST_LINK}
-        onClick={() => {
-          this.context.trackEvent(
-            {
-              category: MetaMetricsEventCategory.Error,
-              event: MetaMetricsEventName.SupportLinkClicked,
-              properties: {
-                url: SUPPORT_REQUEST_LINK,
-              },
-            },
-            {
-              contextPropsIntoEventProperties: [
-                MetaMetricsContextProp.PageTitle,
-              ],
-            },
-          );
-        }}
-      >
-        <span className="error-page__link-text">{this.context.t('here')}</span>
-      </a>
-    );
-    const message = isPopup
-      ? t('errorPagePopupMessage', [supportLink])
-      : t('errorPageMessage', [supportLink]);
-    const errorMessage = getErrorMessage(error);
-
-    return (
-      <section className="error-page">
-        <h1 className="error-page__header">{t('errorPageTitle')}</h1>
-        <h2 className="error-page__subheader">{message}</h2>
-        <section className="error-page__details">
-          <details>
-            <summary>{t('errorDetails')}</summary>
-            <ul>
-              {errorMessage
-                ? this.renderErrorDetail(t('errorMessage', [errorMessage]))
-                : null}
-              {error.code
-                ? this.renderErrorDetail(t('errorCode', [error.code]))
-                : null}
-              {error.name
-                ? this.renderErrorDetail(t('errorName', [error.name]))
-                : null}
-              {error.stack
-                ? this.renderErrorStack(t('errorStack'), error.stack)
-                : null}
-            </ul>
-          </details>
-        </section>
-      </section>
-    );
-  }
-}
-
-export default ErrorPage;
diff --git a/ui/pages/error/index.js b/ui/pages/error/index.js
deleted file mode 100644
index 386b79786307..000000000000
--- a/ui/pages/error/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './error.component';
diff --git a/ui/pages/error/index.scss b/ui/pages/error/index.scss
deleted file mode 100644
index 10e00597e8ed..000000000000
--- a/ui/pages/error/index.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@use "design-system";
-
-.error-page {
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
-  font-style: normal;
-  font-weight: normal;
-  padding: 35px 10px 10px 10px;
-  height: 100%;
-
-  &__header {
-    @include design-system.H1;
-
-    display: flex;
-    justify-content: center;
-    padding: 10px 0;
-    text-align: center;
-  }
-
-  &__subheader {
-    @include design-system.H4;
-
-    padding: 10px 0;
-    width: 100%;
-    max-width: 720px;
-    text-align: center;
-  }
-
-  &__details {
-    @include design-system.H4;
-
-    overflow-y: auto;
-    width: 100%;
-    max-width: 720px;
-    padding-top: 10px;
-  }
-
-  &__stack {
-    overflow-x: auto;
-    background-color: var(--color-background-alternative);
-  }
-
-  &__link-text {
-    color: var(--color-primary-default);
-  }
-}
diff --git a/ui/pages/index.js b/ui/pages/index.js
index c30846fff1e6..9b6147b6f421 100644
--- a/ui/pages/index.js
+++ b/ui/pages/index.js
@@ -11,7 +11,8 @@ import {
 } from '../contexts/metametrics';
 import { MetamaskNotificationsProvider } from '../contexts/metamask-notifications';
 import { AssetPollingProvider } from '../contexts/assetPolling';
-import ErrorPage from './error';
+import ErrorPage from './error-page/error-page.component';
+
 import Routes from './routes';
 
 class Index extends PureComponent {
@@ -26,7 +27,7 @@ class Index extends PureComponent {
   }
 
   render() {
-    const { error, errorId } = this.state;
+    const { error } = this.state;
     const { store } = this.props;
 
     if (error) {
@@ -34,7 +35,7 @@ class Index extends PureComponent {
         <Provider store={store}>
           <I18nProvider>
             <LegacyI18nProvider>
-              <ErrorPage error={error} errorId={errorId} />
+              <ErrorPage error={error} />
             </LegacyI18nProvider>
           </I18nProvider>
         </Provider>
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index 378622a3994a..84276e4c7d99 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -10,7 +10,7 @@
 @import 'connected-sites/index';
 @import 'create-account/create-account';
 @import 'create-account/connect-hardware/index';
-@import 'error/index';
+@import 'error-page/index';
 @import 'home/index';
 @import "institutional/account-list/index";
 @import "institutional/institutional-entity-done-page/index";
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 4eea2d9cf7d1..17899d68724f 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
@@ -319,7 +319,7 @@ exports[`Develop options tab should match snapshot 1`] = `
           class="settings-page__content-item-col"
         >
           <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md 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"
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg 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-theme="light"
           >
             Generate UI Error
@@ -362,7 +362,7 @@ exports[`Develop options tab should match snapshot 1`] = `
           class="settings-page__content-item-col"
         >
           <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md 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"
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg 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-theme="light"
           >
             Generate Background Error
@@ -405,7 +405,7 @@ exports[`Develop options tab should match snapshot 1`] = `
           class="settings-page__content-item-col"
         >
           <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md 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"
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg 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-theme="light"
           >
             Generate Trace
@@ -426,6 +426,46 @@ exports[`Develop options tab should match snapshot 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+              Trigger the crash on extension to send user feedback to sentry. You can click "Try again" to reload extension
+            </span>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg 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="developer-options-generate-page-crash-button"
+            data-theme="light"
+          >
+            Generate A Page Crash
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
index a88d735a628f..a604082586fc 100644
--- a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
+++ b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
@@ -38,7 +38,7 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import { getIsRedesignedConfirmationsDeveloperEnabled } from '../../confirmations/selectors/confirm';
 import ToggleRow from './developer-options-toggle-row-component';
-import { SentryTest } from './sentry-test';
+import SentryTest from './sentry-test';
 import { ProfileSyncDevSettings } from './profile-sync';
 
 /**
diff --git a/ui/pages/settings/developer-options-tab/sentry-test.tsx b/ui/pages/settings/developer-options-tab/sentry-test.tsx
index 7d04e3a4dd87..5c7132a7cfea 100644
--- a/ui/pages/settings/developer-options-tab/sentry-test.tsx
+++ b/ui/pages/settings/developer-options-tab/sentry-test.tsx
@@ -1,8 +1,9 @@
 import React, { useState, useCallback, ReactElement } from 'react';
-import { ButtonVariant } from '@metamask/snaps-sdk';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   Box,
   Button,
+  ButtonVariant,
   Icon,
   IconName,
   IconSize,
@@ -16,8 +17,23 @@ import {
   JustifyContent,
 } from '../../../helpers/constants/design-system';
 import { trace, TraceName } from '../../../../shared/lib/trace';
+import { ButtonSize } from '../../../components/component-library/button/button.types';
+
+import {
+  forceUpdateMetamaskState,
+  setCurrentLocale,
+} from '../../../store/actions';
+import { FALLBACK_LOCALE, fetchLocale } from '../../../../shared/modules/i18n';
+import { getCurrentLocale } from '../../../ducks/locale/locale';
+
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+const SentryTest = () => {
+  const currentLocale: string =
+    useSelector(getCurrentLocale) || FALLBACK_LOCALE;
 
-export function SentryTest() {
   return (
     <>
       <Text className="settings-page__security-tab-sub-header__bold">
@@ -27,10 +43,11 @@ export function SentryTest() {
         <GenerateUIError />
         <GenerateBackgroundError />
         <GenerateTrace />
+        <GeneratePageCrash currentLocale={currentLocale} />
       </div>
     </>
   );
-}
+};
 
 function GenerateUIError() {
   const handleClick = useCallback(async () => {
@@ -115,16 +132,48 @@ function GenerateTrace() {
   );
 }
 
+function GeneratePageCrash({ currentLocale }: { currentLocale: string }) {
+  const dispatch = useDispatch();
+  const handleClick = async () => {
+    const localeMessages = await fetchLocale(currentLocale);
+    await dispatch(
+      setCurrentLocale(currentLocale, {
+        ...localeMessages,
+        // @ts-expect-error - remove a language string in this page to trigger a page crash
+        developerOptions: undefined,
+      }),
+    );
+    await forceUpdateMetamaskState(dispatch);
+  };
+
+  return (
+    <TestButton
+      name="Generate A Page Crash"
+      description={
+        <span>
+          Trigger the crash on extension to send user feedback to sentry. You
+          can click "Try again" to reload extension
+        </span>
+      }
+      onClick={handleClick}
+      expectError
+      testId="developer-options-generate-page-crash-button"
+    />
+  );
+}
+
 function TestButton({
   name,
   description,
   onClick,
   expectError,
+  testId,
 }: {
   name: string;
   description: ReactElement;
   onClick: () => Promise<void>;
   expectError?: boolean;
+  testId?: string;
 }) {
   const [isComplete, setIsComplete] = useState(false);
 
@@ -155,7 +204,12 @@ function TestButton({
         <div className="settings-page__content-description">{description}</div>
       </div>
       <div className="settings-page__content-item-col">
-        <Button variant={ButtonVariant.Primary} onClick={handleClick}>
+        <Button
+          variant={ButtonVariant.Primary}
+          onClick={handleClick}
+          size={ButtonSize.Lg}
+          data-testid={testId}
+        >
           {name}
         </Button>
       </div>
@@ -180,6 +234,4 @@ function TestButton({
   );
 }
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+export default SentryTest;
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 119b01257802..6cd630245819 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -336,7 +336,7 @@ class SettingsPage extends PureComponent {
       });
     }
 
-    if (process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS) {
+    if (process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS || process.env.IN_TEST) {
       tabs.splice(-1, 0, {
         content: t('developerOptions'),
         icon: <Icon name={IconName.CodeCircle} />,
@@ -410,7 +410,8 @@ class SettingsPage extends PureComponent {
         />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
         <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
-        {process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS && (
+        {(process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS ||
+          process.env.IN_TEST) && (
           <Route
             exact
             path={DEVELOPER_OPTIONS_ROUTE}

From 77314cf8b8be958d13fd6e40e81b46e12f7be411 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Fri, 8 Nov 2024 15:17:27 +0100
Subject: [PATCH 063/111] test: [POM] Refactor import account e2e tests to use
 Page Object Model (#28325)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate e2e tests `test/e2e/tests/account/add-account.spec.js` to TS
and Page Object Model, to reduce flakiness.
- Migrate e2e tests `test/e2e/tests/account/import-flow.spec.js` to TS
and Page Object Model, to reduce flakiness.
- Deprecate/remove old functions
- Use onboarding related functions designed in page object model, which
are more stable, and removed unnecessary delays.

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

## **Related issues**

Fixes: #28328

## **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: seaona <54408225+seaona@users.noreply.github.com>
---
 test/e2e/helpers.js                           | 112 +----
 .../e2e/page-objects/flows/onboarding.flow.ts |  23 +-
 .../flows/send-transaction.flow.ts            | 125 +++--
 .../page-objects/pages/account-list-page.ts   | 185 ++++++-
 .../pages/onboarding/onboarding-srp-page.ts   |  15 +
 .../pages/send/send-token-page.ts             | 119 ++---
 test/e2e/tests/account/add-account.spec.js    | 232 ---------
 test/e2e/tests/account/add-account.spec.ts    | 123 +++++
 test/e2e/tests/account/import-flow.spec.js    | 474 ------------------
 test/e2e/tests/account/import-flow.spec.ts    | 115 +++++
 .../account/snap-account-transfers.spec.ts    |  42 +-
 .../erc20-token-send-redesign.spec.ts         |   4 +-
 .../hardware-wallets/lattice-connect.spec.ts  |  44 ++
 .../tests/privacy/basic-functionality.spec.js |  27 +-
 .../e2e/tests/transaction/simple-send.spec.ts |  14 +-
 15 files changed, 692 insertions(+), 962 deletions(-)
 delete mode 100644 test/e2e/tests/account/add-account.spec.js
 create mode 100644 test/e2e/tests/account/add-account.spec.ts
 delete mode 100644 test/e2e/tests/account/import-flow.spec.js
 create mode 100644 test/e2e/tests/account/import-flow.spec.ts
 create mode 100644 test/e2e/tests/hardware-wallets/lattice-connect.spec.ts

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 1c3f53b30224..1e03da918ed7 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -385,107 +385,6 @@ const getWindowHandles = async (driver, handlesCount) => {
   return { extension, dapp, popup };
 };
 
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * @param driver
- * @param seedPhrase
- * @param password
- */
-const importSRPOnboardingFlow = async (driver, seedPhrase, password) => {
-  // agree to terms of use
-  await driver.clickElement('[data-testid="onboarding-terms-checkbox"]');
-
-  // welcome
-  await driver.clickElement('[data-testid="onboarding-import-wallet"]');
-
-  // metrics
-  await driver.clickElement('[data-testid="metametrics-no-thanks"]');
-
-  await driver.waitForSelector('.import-srp__actions');
-  // import with recovery phrase
-  await driver.pasteIntoField(
-    '[data-testid="import-srp__srp-word-0"]',
-    seedPhrase,
-  );
-  await driver.clickElement('[data-testid="import-srp-confirm"]');
-
-  // create password
-  await driver.fill('[data-testid="create-password-new"]', password);
-  await driver.fill('[data-testid="create-password-confirm"]', password);
-  await driver.clickElement('[data-testid="create-password-terms"]');
-  await driver.clickElement('[data-testid="create-password-import"]');
-  await driver.assertElementNotPresent('.loading-overlay');
-};
-
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * @param driver
- * @param seedPhrase
- * @param password
- */
-const completeImportSRPOnboardingFlow = async (
-  driver,
-  seedPhrase,
-  password,
-) => {
-  await importSRPOnboardingFlow(driver, seedPhrase, password);
-
-  // 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"]');
-};
-
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * @param driver
- * @param seedPhrase
- * @param password
- */
-const completeImportSRPOnboardingFlowWordByWord = async (
-  driver,
-  seedPhrase,
-  password,
-) => {
-  // agree to terms of use
-  await driver.clickElement('[data-testid="onboarding-terms-checkbox"]');
-
-  // welcome
-  await driver.clickElement('[data-testid="onboarding-import-wallet"]');
-
-  // metrics
-
-  await driver.clickElement('[data-testid="metametrics-no-thanks"]');
-
-  // import with recovery phrase, word by word
-  const words = seedPhrase.split(' ');
-  for (const word of words) {
-    await driver.pasteIntoField(
-      `[data-testid="import-srp__srp-word-${words.indexOf(word)}"]`,
-      word,
-    );
-  }
-  await driver.clickElement('[data-testid="import-srp-confirm"]');
-
-  // create password
-  await driver.fill('[data-testid="create-password-new"]', password);
-  await driver.fill('[data-testid="create-password-confirm"]', password);
-  await driver.clickElement('[data-testid="create-password-terms"]');
-  await driver.clickElement('[data-testid="create-password-import"]');
-
-  // wait for loading to complete
-  await driver.assertElementNotPresent('.loading-overlay');
-
-  // 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"]');
-};
-
 /**
  * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
  * Begin the create new wallet flow on onboarding screen.
@@ -1237,6 +1136,10 @@ async function initBundler(bundlerServer, ganacheServer, usePaymaster) {
   }
 }
 
+/**
+ * @deprecated Please use page object functions in `pages/account-list-page`.
+ * @param driver
+ */
 async function removeSelectedAccount(driver) {
   await driver.clickElement('[data-testid="account-menu-icon"]');
   await driver.clickElement(
@@ -1246,6 +1149,10 @@ async function removeSelectedAccount(driver) {
   await driver.clickElement({ text: 'Remove', tag: 'button' });
 }
 
+/**
+ * @deprecated Please use page object functions in `pages/account-list-page`.
+ * @param driver
+ */
 async function getSelectedAccountAddress(driver) {
   await driver.clickElement('[data-testid="account-options-menu-button"]');
   await driver.clickElement('[data-testid="account-list-menu-details"]');
@@ -1328,9 +1235,6 @@ module.exports = {
   largeDelayMs,
   veryLargeDelayMs,
   withFixtures,
-  importSRPOnboardingFlow,
-  completeImportSRPOnboardingFlow,
-  completeImportSRPOnboardingFlowWordByWord,
   completeCreateNewWalletOnboardingFlow,
   completeCreateNewWalletOnboardingFlowWithOptOut,
   openSRPRevealQuiz,
diff --git a/test/e2e/page-objects/flows/onboarding.flow.ts b/test/e2e/page-objects/flows/onboarding.flow.ts
index adf591330798..e235048b0a01 100644
--- a/test/e2e/page-objects/flows/onboarding.flow.ts
+++ b/test/e2e/page-objects/flows/onboarding.flow.ts
@@ -43,17 +43,20 @@ export const createNewWalletOnboardingFlow = async (
  *
  * @param options - The options object.
  * @param options.driver - The WebDriver instance.
- * @param [options.seedPhrase] - The seed phrase to import.
- * @param [options.password] - The password to use.
+ * @param [options.seedPhrase] - The seed phrase to import. Defaults to E2E_SRP.
+ * @param [options.password] - The password to use. Defaults to WALLET_PASSWORD.
+ * @param [options.fillSrpWordByWord] - Whether to fill the SRP word by word. Defaults to false.
  */
 export const importSRPOnboardingFlow = async ({
   driver,
   seedPhrase = E2E_SRP,
   password = WALLET_PASSWORD,
+  fillSrpWordByWord = false,
 }: {
   driver: Driver;
   seedPhrase?: string;
   password?: string;
+  fillSrpWordByWord?: boolean;
 }): Promise<void> => {
   console.log('Starting the import of SRP onboarding flow');
   await driver.navigate();
@@ -69,7 +72,11 @@ export const importSRPOnboardingFlow = async ({
 
   const onboardingSrpPage = new OnboardingSrpPage(driver);
   await onboardingSrpPage.check_pageIsLoaded();
-  await onboardingSrpPage.fillSrp(seedPhrase);
+  if (fillSrpWordByWord) {
+    await onboardingSrpPage.fillSrpWordByWord(seedPhrase);
+  } else {
+    await onboardingSrpPage.fillSrp(seedPhrase);
+  }
   await onboardingSrpPage.clickConfirmButton();
 
   const onboardingPasswordPage = new OnboardingPasswordPage(driver);
@@ -102,19 +109,27 @@ export const completeCreateNewWalletOnboardingFlow = async (
  * @param options.driver - The WebDriver instance.
  * @param [options.seedPhrase] - The seed phrase to import. Defaults to E2E_SRP.
  * @param [options.password] - The password to use. Defaults to WALLET_PASSWORD.
+ * @param [options.fillSrpWordByWord] - Whether to fill the SRP word by word. Defaults to false.
  * @returns A promise that resolves when the onboarding flow is complete.
  */
 export const completeImportSRPOnboardingFlow = async ({
   driver,
   seedPhrase = E2E_SRP,
   password = WALLET_PASSWORD,
+  fillSrpWordByWord = false,
 }: {
   driver: Driver;
   seedPhrase?: string;
   password?: string;
+  fillSrpWordByWord?: boolean;
 }): Promise<void> => {
   console.log('Starting to complete import SRP onboarding flow');
-  await importSRPOnboardingFlow({ driver, seedPhrase, password });
+  await importSRPOnboardingFlow({
+    driver,
+    seedPhrase,
+    password,
+    fillSrpWordByWord,
+  });
 
   const onboardingCompletePage = new OnboardingCompletePage(driver);
   await onboardingCompletePage.check_pageIsLoaded();
diff --git a/test/e2e/page-objects/flows/send-transaction.flow.ts b/test/e2e/page-objects/flows/send-transaction.flow.ts
index 1cffe2428873..3f56076e3934 100644
--- a/test/e2e/page-objects/flows/send-transaction.flow.ts
+++ b/test/e2e/page-objects/flows/send-transaction.flow.ts
@@ -7,19 +7,26 @@ import SnapSimpleKeyringPage from '../pages/snap-simple-keyring-page';
 /**
  * This function initiates the steps required to send a transaction from the homepage to final confirmation.
  *
- * @param driver - The webdriver instance.
- * @param recipientAddress - The recipient address.
- * @param amount - The amount of the asset to be sent in the transaction.
- * @param gasfee - The expected transaction gas fee.
- * @param totalfee - The expected total transaction fee.
+ * @param params - An object containing the parameters.
+ * @param params.driver - The webdriver instance.
+ * @param params.recipientAddress - The recipient address.
+ * @param params.amount - The amount of the asset to be sent in the transaction.
+ * @param params.gasFee - The expected transaction gas fee.
+ * @param params.totalFee - The expected total transaction fee.
  */
-export const sendTransaction = async (
-  driver: Driver,
-  recipientAddress: string,
-  amount: string,
-  gasfee: string,
-  totalfee: string,
-): Promise<void> => {
+export const sendTransactionToAddress = async ({
+  driver,
+  recipientAddress,
+  amount,
+  gasFee,
+  totalFee,
+}: {
+  driver: Driver;
+  recipientAddress: string;
+  amount: string;
+  gasFee: string;
+  totalFee: string;
+}): Promise<void> => {
   console.log(
     `Start flow to send amount ${amount} to recipient ${recipientAddress} on home screen`,
   );
@@ -36,31 +43,89 @@ export const sendTransaction = async (
 
   // confirm transaction when user lands on confirm transaction screen
   const confirmTxPage = new ConfirmTxPage(driver);
-  await confirmTxPage.check_pageIsLoaded(gasfee, totalfee);
+  await confirmTxPage.check_pageIsLoaded(gasFee, totalFee);
+  await confirmTxPage.confirmTx();
+};
+
+/**
+ * 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.
+ * @param params.gasFee - The expected transaction gas fee.
+ * @param params.totalFee - The expected total transaction fee.
+ */
+export const sendTransactionToAccount = async ({
+  driver,
+  recipientAccount,
+  amount,
+  gasFee,
+  totalFee,
+}: {
+  driver: Driver;
+  recipientAccount: string;
+  amount: string;
+  gasFee: string;
+  totalFee: 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 confirmTxPage = new ConfirmTxPage(driver);
+  await confirmTxPage.check_pageIsLoaded(gasFee, totalFee);
   await confirmTxPage.confirmTx();
 };
 
 /**
  * This function initiates the steps required to send a transaction from snap account on homepage to final confirmation.
  *
- * @param driver - The webdriver instance.
- * @param recipientAddress - The recipient address.
- * @param amount - The amount of the asset to be sent in the transaction.
- * @param gasfee - The expected transaction gas fee.
- * @param totalfee - The expected total transaction fee.
- * @param isSyncFlow - Indicates whether synchronous approval option is on for the snap. Defaults to true.
- * @param approveTransaction - Indicates whether the transaction should be approved. Defaults to true.
+ * @param params - An object containing the parameters.
+ * @param params.driver - The webdriver instance.
+ * @param params.recipientAddress - The recipient address.
+ * @param params.amount - The amount of the asset to be sent in the transaction.
+ * @param params.gasFee - The expected transaction gas fee.
+ * @param params.totalFee - The expected total transaction fee.
+ * @param params.isSyncFlow - Indicates whether synchronous approval option is on for the snap. Defaults to true.
+ * @param params.approveTransaction - Indicates whether the transaction should be approved. Defaults to true.
  */
-export const sendTransactionWithSnapAccount = async (
-  driver: Driver,
-  recipientAddress: string,
-  amount: string,
-  gasfee: string,
-  totalfee: string,
-  isSyncFlow: boolean = true,
-  approveTransaction: boolean = true,
-): Promise<void> => {
-  await sendTransaction(driver, recipientAddress, amount, gasfee, totalfee);
+export const sendTransactionWithSnapAccount = async ({
+  driver,
+  recipientAddress,
+  amount,
+  gasFee,
+  totalFee,
+  isSyncFlow = true,
+  approveTransaction = true,
+}: {
+  driver: Driver;
+  recipientAddress: string;
+  amount: string;
+  gasFee: string;
+  totalFee: string;
+  isSyncFlow?: boolean;
+  approveTransaction?: boolean;
+}): Promise<void> => {
+  await sendTransactionToAddress({
+    driver,
+    recipientAddress,
+    amount,
+    gasFee,
+    totalFee,
+  });
   if (!isSyncFlow) {
     await new SnapSimpleKeyringPage(driver).approveRejectSnapAccountTransaction(
       approveTransaction,
diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index ae02973b6ae5..fb7c1232c08c 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -1,4 +1,5 @@
 import { Driver } from '../../webdriver/driver';
+import { largeDelayMs } from '../../helpers';
 
 class AccountListPage {
   private readonly driver: Driver;
@@ -17,12 +18,13 @@ class AccountListPage {
   private readonly accountOptionsMenuButton =
     '[data-testid="account-list-item-menu-button"]';
 
+  private readonly accountQrCodeImage = '.qr-code__wrapper';
+
+  private readonly accountQrCodeAddress = '.qr-code__address-segments';
+
   private readonly addAccountConfirmButton =
     '[data-testid="submit-add-account-with-name"]';
 
-  private readonly importAccountConfirmButton =
-    '[data-testid="import-account-confirm-button"]';
-
   private readonly addEthereumAccountButton =
     '[data-testid="multichain-account-menu-popover-add-account"]';
 
@@ -39,29 +41,61 @@ class AccountListPage {
   private readonly createAccountButton =
     '[data-testid="multichain-account-menu-popover-action-button"]';
 
+  private readonly currentSelectedAccount =
+    '.multichain-account-list-item--selected';
+
   private readonly editableLabelButton =
     '[data-testid="editable-label-button"]';
 
   private readonly editableLabelInput = '[data-testid="editable-input"] input';
 
-  private readonly hideUnhideAccountButton =
-    '[data-testid="account-list-menu-hide"]';
-
   private readonly hiddenAccountOptionsMenuButton =
     '.multichain-account-menu-popover__list--menu-item-hidden-account [data-testid="account-list-item-menu-button"]';
 
   private readonly hiddenAccountsList = '[data-testid="hidden-accounts-list"]';
 
+  private readonly hideUnhideAccountButton =
+    '[data-testid="account-list-menu-hide"]';
+
+  private readonly importAccountConfirmButton =
+    '[data-testid="import-account-confirm-button"]';
+
+  private readonly importAccountPrivateKeyInput = '#private-key-box';
+
+  private readonly importAccountDropdownOption = '.dropdown__select';
+
+  private readonly importAccountJsonFileOption = {
+    text: 'JSON File',
+    tag: 'option',
+  };
+
+  private readonly importAccountJsonFileInput =
+    'input[data-testid="file-input"]';
+
+  private readonly importAccountJsonPasswordInput =
+    'input[id="json-password-box"]';
+
   private readonly pinUnpinAccountButton =
     '[data-testid="account-list-menu-pin"]';
 
   private readonly pinnedIcon = '[data-testid="account-pinned-icon"]';
 
+  private readonly removeAccountButton =
+    '[data-testid="account-list-menu-remove"]';
+
+  private readonly removeAccountConfirmButton = {
+    text: 'Remove',
+    tag: 'button',
+  };
+
+  private readonly removeAccountMessage = {
+    text: 'Remove account?',
+    tag: 'div',
+  };
+
   private readonly saveAccountLabelButton =
     '[data-testid="save-account-label-input"]';
 
-  private readonly importAccountPrivateKeyInput = '#private-key-box';
-
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -89,6 +123,9 @@ class AccountListPage {
     await this.driver.clickElement(this.createAccountButton);
     await this.driver.clickElement(this.addEthereumAccountButton);
     await this.driver.fill(this.accountNameInput, customLabel);
+    // needed to mitigate a race condition with the state update
+    // there is no condition we can wait for in the UI
+    await this.driver.delay(largeDelayMs);
     await this.driver.clickElementAndWaitToDisappear(
       this.addAccountConfirmButton,
     );
@@ -102,24 +139,39 @@ class AccountListPage {
     console.log(`Adding new account with next available name`);
     await this.driver.clickElement(this.createAccountButton);
     await this.driver.clickElement(this.addEthereumAccountButton);
+    // needed to mitigate a race condition with the state update
+    // there is no condition we can wait for in the UI
+    await this.driver.delay(largeDelayMs);
     await this.driver.clickElementAndWaitToDisappear(
       this.addAccountConfirmButton,
     );
   }
 
   /**
-   * Adds a new account with a custom label.
+   * Import a new account with a private key.
    *
    * @param privateKey - Private key of the account
+   * @param expectedErrorMessage - Expected error message if the import should fail
    */
-  async addNewImportedAccount(privateKey: string): Promise<void> {
+  async addNewImportedAccount(
+    privateKey: string,
+    expectedErrorMessage?: string,
+  ): Promise<void> {
     console.log(`Adding new imported account`);
     await this.driver.clickElement(this.createAccountButton);
     await this.driver.clickElement(this.addImportedAccountButton);
     await this.driver.fill(this.importAccountPrivateKeyInput, privateKey);
-    await this.driver.clickElementAndWaitToDisappear(
-      this.importAccountConfirmButton,
-    );
+    if (expectedErrorMessage) {
+      await this.driver.clickElement(this.importAccountConfirmButton);
+      await this.driver.waitForSelector({
+        css: '.mm-help-text',
+        text: expectedErrorMessage,
+      });
+    } else {
+      await this.driver.clickElementAndWaitToDisappear(
+        this.importAccountConfirmButton,
+      );
+    }
   }
 
   /**
@@ -148,6 +200,59 @@ class AccountListPage {
     await this.driver.clickElement(this.hideUnhideAccountButton);
   }
 
+  /**
+   * Import an account with a JSON file.
+   *
+   * @param jsonFilePath - Path to the JSON file to import
+   * @param password - Password for the imported account
+   */
+  async importAccountWithJsonFile(
+    jsonFilePath: string,
+    password: string,
+  ): Promise<void> {
+    console.log(`Adding new imported account`);
+    await this.driver.clickElement(this.createAccountButton);
+    await this.driver.clickElement(this.addImportedAccountButton);
+    await this.driver.clickElement(this.importAccountDropdownOption);
+    await this.driver.clickElement(this.importAccountJsonFileOption);
+
+    const fileInput = await this.driver.findElement(
+      this.importAccountJsonFileInput,
+    );
+    await fileInput.sendKeys(jsonFilePath);
+    await this.driver.fill(this.importAccountJsonPasswordInput, password);
+    await this.driver.clickElementAndWaitToDisappear(
+      this.importAccountConfirmButton,
+    );
+  }
+
+  /**
+   * Open the account details modal for the specified account in account list.
+   *
+   * @param accountLabel - The label of the account to open the details modal for.
+   */
+  async openAccountDetailsModal(accountLabel: string): Promise<void> {
+    console.log(
+      `Open account details modal in account list for account ${accountLabel}`,
+    );
+    await this.openAccountOptionsInAccountList(accountLabel);
+    await this.driver.clickElement(this.accountMenuButton);
+  }
+
+  /**
+   * Open the account options menu for the specified account.
+   *
+   * @param accountLabel - The label of the account to open the options menu for.
+   */
+  async openAccountOptionsInAccountList(accountLabel: string): Promise<void> {
+    console.log(
+      `Open account options in account list for account ${accountLabel}`,
+    );
+    await this.driver.clickElement(
+      `button[data-testid="account-list-item-menu-button"][aria-label="${accountLabel} Options"]`,
+    );
+  }
+
   async openAccountOptionsMenu(): Promise<void> {
     console.log(`Open account option menu`);
     await this.driver.waitForSelector(this.accountListItem);
@@ -175,6 +280,19 @@ class AccountListPage {
     await this.driver.clickElement(this.pinUnpinAccountButton);
   }
 
+  /**
+   * Remove the specified account from the account list.
+   *
+   * @param accountLabel - The label of the account to remove.
+   */
+  async removeAccount(accountLabel: string): Promise<void> {
+    console.log(`Remove account in account list`);
+    await this.openAccountOptionsInAccountList(accountLabel);
+    await this.driver.clickElement(this.removeAccountButton);
+    await this.driver.waitForSelector(this.removeAccountMessage);
+    await this.driver.clickElement(this.removeAccountConfirmButton);
+  }
+
   async switchToAccount(expectedLabel: string): Promise<void> {
     console.log(
       `Switch to account with label ${expectedLabel} in account list`,
@@ -259,6 +377,32 @@ class AccountListPage {
     await this.driver.assertElementNotPresent(this.addSnapAccountButton);
   }
 
+  /**
+   * Check that the correct address is displayed in the account details modal.
+   *
+   * @param expectedAddress - The expected address to check.
+   */
+  async check_addressInAccountDetailsModal(
+    expectedAddress: string,
+  ): Promise<void> {
+    console.log(
+      `Check that address ${expectedAddress} is displayed in account details modal`,
+    );
+    await this.driver.waitForSelector(this.accountQrCodeImage);
+    await this.driver.waitForSelector({
+      css: this.accountQrCodeAddress,
+      text: expectedAddress,
+    });
+  }
+
+  async check_currentAccountIsImported(): Promise<void> {
+    console.log(`Check that current account is an imported account`);
+    await this.driver.waitForSelector({
+      css: this.currentSelectedAccount,
+      text: 'Imported',
+    });
+  }
+
   async check_hiddenAccountsListExists(): Promise<void> {
     console.log(`Check that hidden accounts list is displayed in account list`);
     await this.driver.waitForSelector(this.hiddenAccountsList);
@@ -282,6 +426,21 @@ class AccountListPage {
       return internalAccounts.length === expectedNumberOfAccounts;
     }, 20000);
   }
+
+  /**
+   * Check that the remove account button is not displayed in the account options menu for the specified account.
+   *
+   * @param accountLabel - The label of the account to check.
+   */
+  async check_removeAccountButtonIsNotDisplayed(
+    accountLabel: string,
+  ): Promise<void> {
+    console.log(
+      `Check that remove account button is not displayed in account options menu for account ${accountLabel} in account list`,
+    );
+    await this.openAccountOptionsInAccountList(accountLabel);
+    await this.driver.assertElementNotPresent(this.removeAccountButton);
+  }
 }
 
 export default AccountListPage;
diff --git a/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts b/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
index b61279c8fe8c..37d1d640670f 100644
--- a/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
+++ b/test/e2e/page-objects/pages/onboarding/onboarding-srp-page.ts
@@ -59,6 +59,21 @@ class OnboardingSrpPage {
     await this.driver.pasteIntoField(this.srpWord0, seedPhrase);
   }
 
+  /**
+   * Fill the SRP words with the provided seed phrase word by word
+   *
+   * @param seedPhrase - The seed phrase to fill. Defaults to E2E_SRP.
+   */
+  async fillSrpWordByWord(seedPhrase: string = E2E_SRP): Promise<void> {
+    const words = seedPhrase.split(' ');
+    for (const word of words) {
+      await this.driver.pasteIntoField(
+        `[data-testid="import-srp__srp-word-${words.indexOf(word)}"]`,
+        word,
+      );
+    }
+  }
+
   async check_confirmSrpButtonIsDisabled(): Promise<void> {
     console.log('Check that confirm SRP button is disabled');
     const confirmSeedPhrase = await this.driver.findElement(
diff --git a/test/e2e/page-objects/pages/send/send-token-page.ts b/test/e2e/page-objects/pages/send/send-token-page.ts
index 60ffd86c6cdd..29222ed3d48c 100644
--- a/test/e2e/page-objects/pages/send/send-token-page.ts
+++ b/test/e2e/page-objects/pages/send/send-token-page.ts
@@ -1,47 +1,37 @@
 import { strict as assert } from 'assert';
 import { Driver } from '../../../webdriver/driver';
-import { RawLocator } from '../../common';
 
 class SendTokenPage {
   private driver: Driver;
 
-  private inputRecipient: string;
+  private readonly assetPickerButton = '[data-testid="asset-picker-button"]';
 
-  private inputAmount: string;
+  private readonly continueButton = {
+    text: 'Continue',
+    tag: 'button',
+  };
 
-  private inputNFTAmount: string;
+  private readonly ensAddressAsRecipient = '[data-testid="ens-input-selected"]';
 
-  private scanButton: string;
+  private readonly ensResolvedName =
+    '[data-testid="multichain-send-page__recipient__item__title"]';
 
-  private continueButton: object;
+  private readonly inputAmount = '[data-testid="currency-input"]';
 
-  private ensResolvedName: string;
+  private readonly inputNFTAmount = '[data-testid="nft-input"]';
 
-  private ensAddressAsRecipient: string;
+  private readonly inputRecipient = '[data-testid="ens-input"]';
 
-  private ensResolvedAddress: string;
+  private readonly recipientAccount =
+    '.multichain-account-list-item__account-name__button';
 
-  private assetPickerButton: RawLocator;
+  private readonly scanButton = '[data-testid="ens-qr-scan-button"]';
 
-  private tokenListButton: RawLocator;
+  private readonly tokenListButton =
+    '[data-testid="multichain-token-list-button"]';
 
   constructor(driver: Driver) {
     this.driver = driver;
-    this.inputAmount = '[data-testid="currency-input"]';
-    this.inputNFTAmount = '[data-testid="nft-input"]';
-    this.inputRecipient = '[data-testid="ens-input"]';
-    this.scanButton = '[data-testid="ens-qr-scan-button"]';
-    this.ensResolvedName =
-      '[data-testid="multichain-send-page__recipient__item__title"]';
-    this.ensResolvedAddress =
-      '[data-testid="multichain-send-page__recipient__item__subtitle"]';
-    this.ensAddressAsRecipient = '[data-testid="ens-input-selected"]';
-    this.continueButton = {
-      text: 'Continue',
-      tag: 'button',
-    };
-    this.assetPickerButton = '[data-testid="asset-picker-button"]';
-    this.tokenListButton = '[data-testid="multichain-token-list-button"]';
   }
 
   async check_pageIsLoaded(): Promise<void> {
@@ -60,11 +50,13 @@ class SendTokenPage {
     console.log('Send token screen is loaded');
   }
 
-  async fillRecipient(recipientAddress: string): Promise<void> {
-    console.log(
-      `Fill recipient input with ${recipientAddress} on send token screen`,
-    );
-    await this.driver.pasteIntoField(this.inputRecipient, recipientAddress);
+  async clickAssetPickerButton() {
+    await this.driver.clickElement(this.assetPickerButton);
+  }
+
+  async clickSecondTokenListButton() {
+    const elements = await this.driver.findElements(this.tokenListButton);
+    await elements[1].click();
   }
 
   async fillAmount(amount: string): Promise<void> {
@@ -86,31 +78,31 @@ class SendTokenPage {
     await this.driver.pasteIntoField(this.inputNFTAmount, amount);
   }
 
+  /**
+   * Fill recipient address input on send token screen.
+   *
+   * @param recipientAddress - The recipient address to fill in the input field.
+   */
+  async fillRecipient(recipientAddress: string): Promise<void> {
+    console.log(
+      `Fill recipient input with ${recipientAddress} on send token screen`,
+    );
+    await this.driver.pasteIntoField(this.inputRecipient, recipientAddress);
+  }
+
   async goToNextScreen(): Promise<void> {
     await this.driver.clickElement(this.continueButton);
   }
 
   /**
-   * Verifies that an ENS domain correctly resolves to the specified Ethereum address on the send token screen.
+   * Select recipient account on send token screen.
    *
-   * @param ensDomain - The ENS domain name expected to resolve (e.g., "test.eth").
-   * @param address - The Ethereum address to which the ENS domain is expected to resolve.
-   * @returns A promise that resolves if the ENS domain successfully resolves to the specified address on send token screen.
+   * @param recipientAccount - The recipient account to select.
    */
-  async check_ensAddressResolution(
-    ensDomain: string,
-    address: string,
-  ): Promise<void> {
-    console.log(
-      `Check ENS domain resolution: '${ensDomain}' should resolve to address '${address}' on the send token screen.`,
-    );
-    // check if ens domain is resolved as expected address
-    await this.driver.waitForSelector({
-      text: ensDomain,
-      css: this.ensResolvedName,
-    });
-    await this.driver.waitForSelector({
-      text: address,
+  async selectRecipientAccount(recipientAccount: string): Promise<void> {
+    await this.driver.clickElement({
+      text: recipientAccount,
+      css: this.recipientAccount,
     });
   }
 
@@ -140,13 +132,28 @@ class SendTokenPage {
     );
   }
 
-  async click_assetPickerButton() {
-    await this.driver.clickElement(this.assetPickerButton);
-  }
-
-  async click_secondTokenListButton() {
-    const elements = await this.driver.findElements(this.tokenListButton);
-    await elements[1].click();
+  /**
+   * Verifies that an ENS domain correctly resolves to the specified Ethereum address on the send token screen.
+   *
+   * @param ensDomain - The ENS domain name expected to resolve (e.g., "test.eth").
+   * @param address - The Ethereum address to which the ENS domain is expected to resolve.
+   * @returns A promise that resolves if the ENS domain successfully resolves to the specified address on send token screen.
+   */
+  async check_ensAddressResolution(
+    ensDomain: string,
+    address: string,
+  ): Promise<void> {
+    console.log(
+      `Check ENS domain resolution: '${ensDomain}' should resolve to address '${address}' on the send token screen.`,
+    );
+    // check if ens domain is resolved as expected address
+    await this.driver.waitForSelector({
+      text: ensDomain,
+      css: this.ensResolvedName,
+    });
+    await this.driver.waitForSelector({
+      text: address,
+    });
   }
 }
 
diff --git a/test/e2e/tests/account/add-account.spec.js b/test/e2e/tests/account/add-account.spec.js
deleted file mode 100644
index 04980cf20c3e..000000000000
--- a/test/e2e/tests/account/add-account.spec.js
+++ /dev/null
@@ -1,232 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  TEST_SEED_PHRASE,
-  withFixtures,
-  completeImportSRPOnboardingFlow,
-  sendTransaction,
-  findAnotherAccountFromAccountList,
-  locateAccountBalanceDOM,
-  logInWithBalanceValidation,
-  regularDelayMs,
-  unlockWallet,
-  WALLET_PASSWORD,
-  generateGanacheOptions,
-} = require('../../helpers');
-
-const FixtureBuilder = require('../../fixture-builder');
-
-describe('Add account', function () {
-  const secondAccount = '0x3ED0eE22E0685Ebbf07b2360A8331693c413CC59';
-
-  const ganacheOptions = generateGanacheOptions({
-    secretKey:
-      '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9',
-  });
-
-  it('should display correct new account name after create', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-add-account"]',
-        );
-
-        await driver.fill('[placeholder="Account 2"]', '2nd account');
-        // needed to mitigate a race condition with the state update
-        // there is no condition we can wait for in the UI
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({ text: 'Add account', tag: 'button' });
-        await driver.findElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: '2nd account',
-        });
-      },
-    );
-  });
-
-  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,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await driver.navigate();
-
-        // On boarding with 1st account
-        await completeImportSRPOnboardingFlow(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
-
-        // Check address of 1st accoun
-        await locateAccountBalanceDOM(driver, ganacheServer);
-        await driver.findElement('[data-testid="app-header-copy-button"]');
-
-        // Create 2nd account
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // 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(
-          '[data-testid="multichain-account-menu-popover-add-account"]',
-        );
-        await driver.fill('[placeholder="Account 2"]', '2nd account');
-        // needed to mitigate a race condition with the state update
-        // there is no condition we can wait for in the UI
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({ text: 'Add account', tag: 'button' });
-
-        // Check address of 2nd account
-        await locateAccountBalanceDOM(driver);
-        await driver.findElement('[data-testid="app-header-copy-button"]');
-
-        // Log into the account with balance(account 1)
-        // and transfer some balance to 2nd account
-        // so they will not be removed after recovering SRP
-        const accountOneSelector = await findAnotherAccountFromAccountList(
-          driver,
-          1,
-          'Account 1',
-        );
-        await locateAccountBalanceDOM(driver);
-        await driver.clickElement(accountOneSelector);
-        await sendTransaction(driver, secondAccount, '2.8');
-
-        // Lock the account
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-
-        await driver.clickElement('[data-testid="global-menu-lock"]');
-        await driver.waitForSelector('[data-testid="unlock-page"]');
-
-        // Recover via SRP in "forget password" option
-        await driver.clickElement('.unlock-page__link');
-        await driver.pasteIntoField(
-          '[data-testid="import-srp__srp-word-0"]',
-          TEST_SEED_PHRASE,
-        );
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.fill('#confirm-password', 'correct horse battery staple');
-
-        await driver.clickElement(
-          '[data-testid="create-new-vault-submit-button"]',
-        );
-
-        // Land in 1st account home page
-        await driver.findElement('.home__main-view');
-        await locateAccountBalanceDOM(driver);
-
-        // Check address of 1st account
-        await driver.findElement('[data-testid="app-header-copy-button"]');
-
-        // Check address of 2nd account
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement({
-          css: `.multichain-account-list-item__account-name__button`,
-          text: 'Account 2',
-        });
-
-        await driver.findElement('[data-testid="app-header-copy-button"]');
-      },
-    );
-  });
-
-  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 =
-      '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6';
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await logInWithBalanceValidation(driver);
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-add-account"]',
-        );
-        await driver.fill('[placeholder="Account 2"]', '2nd account');
-        // needed to mitigate a race condition with the state update
-        // there is no condition we can wait for in the UI
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({ text: 'Add account', tag: 'button' });
-
-        // Wait for 2nd account to be created
-        await locateAccountBalanceDOM(driver);
-        await driver.findElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: '2nd account',
-        });
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        const menuItems = await driver.findElements(
-          '.multichain-account-list-item',
-        );
-        assert.equal(menuItems.length, 2);
-
-        // User cannot delete 2nd account generated from the SRP imported in onboarding
-        await driver.clickElement(
-          '.multichain-account-list-item--selected [data-testid="account-list-item-menu-button"]',
-        );
-        await driver.assertElementNotPresent(
-          '[data-testid="account-list-menu-remove"]',
-        );
-
-        // Create 3rd account with private key
-        await driver.clickElement('.mm-text-field');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement({ text: 'Import account', tag: 'button' });
-        await driver.fill('#private-key-box', testPrivateKey);
-
-        await driver.clickElement(
-          '[data-testid="import-account-confirm-button"]',
-        );
-
-        // Wait for 3rd account to be created
-        await locateAccountBalanceDOM(driver);
-        await driver.findElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Account 3',
-        });
-
-        // User can delete 3rd account imported with a private key
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        const importedMenuItems = await driver.findElements(
-          '.multichain-account-list-item',
-        );
-        assert.equal(importedMenuItems.length, 3);
-        await driver.clickElement(
-          '.multichain-account-list-item--selected [data-testid="account-list-item-menu-button"]',
-        );
-        await driver.findElement('[data-testid="account-list-menu-remove"]');
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/account/add-account.spec.ts b/test/e2e/tests/account/add-account.spec.ts
new file mode 100644
index 000000000000..3fa65b14e87d
--- /dev/null
+++ b/test/e2e/tests/account/add-account.spec.ts
@@ -0,0 +1,123 @@
+import {
+  withFixtures,
+  WALLET_PASSWORD,
+  defaultGanacheOptions,
+} from '../../helpers';
+import { E2E_SRP } from '../../default-fixture';
+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 LoginPage from '../../page-objects/pages/login-page';
+import ResetPasswordPage from '../../page-objects/pages/reset-password-page';
+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';
+
+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 });
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_ganacheBalanceIsDisplayed(ganacheServer);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+
+        // Create new account with default name Account 2
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.addNewAccountWithDefaultName();
+        await headerNavbar.check_accountLabel('Account 2');
+        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_ganacheBalanceIsDisplayed(ganacheServer);
+        await sendTransactionToAccount({
+          driver,
+          recipientAccount: 'Account 2',
+          amount: '2.8',
+          gasFee: '0.000042',
+          totalFee: '2.800042',
+        });
+        await homePage.check_pageIsLoaded();
+        await homePage.check_confirmedTxNumberDisplayedInActivity();
+        await homePage.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_ganacheBalanceIsDisplayed(ganacheServer);
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.check_accountDisplayedInAccountList('Account 2');
+        await accountListPage.switchToAccount('Account 2');
+        await headerNavbar.check_accountLabel('Account 2');
+        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.addNewAccountWithDefaultName();
+        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/account/import-flow.spec.js b/test/e2e/tests/account/import-flow.spec.js
deleted file mode 100644
index d2c84bfdc2b3..000000000000
--- a/test/e2e/tests/account/import-flow.spec.js
+++ /dev/null
@@ -1,474 +0,0 @@
-const { strict: assert } = require('assert');
-const path = require('path');
-const {
-  TEST_SEED_PHRASE,
-  convertToHexValue,
-  withFixtures,
-  regularDelayMs,
-  largeDelayMs,
-  completeImportSRPOnboardingFlow,
-  completeImportSRPOnboardingFlowWordByWord,
-  openActionMenuAndStartSendFlow,
-  unlockWallet,
-  logInWithBalanceValidation,
-  locateAccountBalanceDOM,
-  WALLET_PASSWORD,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-const { emptyHtmlPage } = require('../../mock-e2e');
-const { isManifestV3 } = require('../../../../shared/modules/mv3.utils');
-
-const ganacheOptions = {
-  accounts: [
-    {
-      secretKey:
-        '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9',
-      balance: convertToHexValue(25000000000000000000),
-    },
-  ],
-};
-
-async function mockTrezor(mockServer) {
-  return await mockServer
-    .forGet('https://connect.trezor.io/9/popup.html')
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        body: emptyHtmlPage(),
-      };
-    });
-}
-
-describe('Import flow @no-mmi', function () {
-  it('Import wallet using Secret Recovery Phrase', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await driver.navigate();
-
-        await completeImportSRPOnboardingFlow(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
-
-        // Show account information
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // Wait until account list is loaded to mitigate race condition
-        await driver.waitForSelector({
-          text: 'Account 1',
-          tag: 'span',
-        });
-        await driver.clickElement(
-          '[data-testid="account-list-item-menu-button"]',
-        );
-        await driver.clickElement('[data-testid="account-list-menu-details"]');
-        await driver.findVisibleElement('.qr-code__wrapper');
-
-        // shows a QR code for the account
-        await driver.findVisibleElement(
-          '[data-testid="account-details-modal"]',
-        );
-        // shows the correct account address
-        await driver.findElement('[data-testid="app-header-copy-button"]');
-
-        await driver.clickElement('button[aria-label="Close"]');
-        await driver.assertElementNotPresent(
-          '[data-testid="account-details-modal"]',
-        );
-        // logs out of the account
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-        await driver.clickElement({
-          css: '[data-testid="global-menu-lock"]',
-          text: 'Lock MetaMask',
-        });
-
-        // accepts the account password after lock
-        await unlockWallet(driver, {
-          navigate: false,
-          waitLoginSuccess: false,
-        });
-
-        // Create a new account
-        // switches to localhost
-        await driver.delay(largeDelayMs);
-        await driver.clickElement('[data-testid="network-display"]');
-        await driver.clickElement('.toggle-button');
-        await driver.clickElement({ text: 'Localhost', tag: 'p' });
-
-        // choose Create account from the account menu
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // 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 a new Ethereum account',
-          tag: 'button',
-        });
-
-        // set account name
-        await driver.fill('[placeholder="Account 2"]', '2nd account');
-        await driver.delay(regularDelayMs);
-        await driver.clickElement({ text: 'Add account', tag: 'button' });
-
-        // should show the correct account name
-        const accountName = await driver.isElementPresent({
-          tag: 'span',
-          text: '2nd account',
-        });
-
-        assert.equal(accountName, true, 'Account name is not correct');
-
-        // Switch back to original account
-        // chooses the original account from the account menu
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '.multichain-account-list-item__account-name__button',
-        );
-
-        // Send ETH from inside MetaMask
-        // starts a send transaction
-        await locateAccountBalanceDOM(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');
-        // Continue to next screen
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // confirms the transaction
-        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);
-
-        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('Import wallet using Secret Recovery Phrase with pasting word by word', async function () {
-    const testAddress = '0x0Cc5261AB8cE458dc977078A3623E2BaDD27afD3';
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-
-        await completeImportSRPOnboardingFlowWordByWord(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
-
-        // Show account information
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // Wait until account list is loaded to mitigate race condition
-        await driver.waitForSelector({
-          text: 'Account 1',
-          tag: 'span',
-        });
-        await driver.clickElement(
-          '[data-testid="account-list-item-menu-button"]',
-        );
-        await driver.clickElement('[data-testid="account-list-menu-details"');
-        await driver.findVisibleElement('.qr-code__wrapper');
-
-        // Extract address segments from the DOM
-        const outerSegment = await driver.findElement(
-          '.qr-code__address-segments',
-        );
-
-        // Get the text content of each segment
-        const displayedAddress = await outerSegment.getText();
-
-        // Assert that the displayed address matches the testAddress
-        assert.strictEqual(
-          displayedAddress.toLowerCase(),
-          testAddress.toLowerCase(),
-          'The displayed address does not match the test address',
-        );
-      },
-    );
-  });
-
-  it('Import Account using private key and remove imported account', async function () {
-    const testPrivateKey1 =
-      '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6';
-    const testPrivateKey2 =
-      'F4EC2590A0C10DE95FBF4547845178910E40F5035320C516A18C117DE02B5669';
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withKeyringControllerImportedAccountVault()
-          .withPreferencesControllerImportedAccountIdentities()
-          .withAccountsControllerImportedAccount()
-          .build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // 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: 'Import account', tag: 'button' });
-
-        // Imports Account 4 with private key
-        await driver.findClickableElement('#private-key-box');
-        await driver.fill('#private-key-box', testPrivateKey1);
-        await driver.clickElement(
-          '[data-testid="import-account-confirm-button"]',
-        );
-
-        // New imported account has correct name and label
-        await driver.findClickableElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Account 4',
-        });
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.findElement({
-          css: `.multichain-account-list-item--selected .multichain-account-list-item__content .mm-tag`,
-          text: 'Imported',
-        });
-
-        // Wait until account list is loaded to mitigate race condition
-        await driver.waitForSelector({
-          text: 'Account 4',
-          tag: 'span',
-        });
-        // Imports Account 5 with private key
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement({ text: 'Import account', tag: 'button' });
-        await driver.findClickableElement('#private-key-box');
-        await driver.fill('#private-key-box', testPrivateKey2);
-        await driver.clickElement(
-          '[data-testid="import-account-confirm-button"]',
-        );
-
-        // New imported account has correct name and label
-        await driver.findClickableElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Account 5',
-        });
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        const accountListItems = await driver.findElements(
-          '.multichain-account-list-item',
-        );
-        assert.equal(accountListItems.length, 5);
-
-        await driver.clickElement(
-          '.multichain-account-list-item--selected [data-testid="account-list-item-menu-button"]',
-        );
-
-        // Account 5 can be removed
-        await driver.clickElement('[data-testid="account-list-menu-remove"]');
-        await driver.clickElement({ text: 'Remove', tag: 'button' });
-
-        await driver.delay(1000);
-        await driver.clickElementUsingMouseMove({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Account 4',
-        });
-        const accountListItemsAfterRemoval = await driver.findElements(
-          '.multichain-account-list-item',
-        );
-        assert.equal(accountListItemsAfterRemoval.length, 4);
-      },
-    );
-  });
-
-  it('Import Account using json file', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withKeyringControllerImportedAccountVault()
-          .withPreferencesControllerImportedAccountIdentities()
-          .withAccountsControllerImportedAccount()
-          .build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-        // Imports an account with JSON file
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // 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: 'Import account', tag: 'button' });
-
-        await driver.clickElement('.dropdown__select');
-        await driver.clickElement({ text: 'JSON File', tag: 'option' });
-
-        const fileInput = await driver.findElement('input[type="file"]');
-        const importJsonFile = path.join(
-          __dirname,
-          '../..',
-          'import-utc-json',
-          'test-json-import-account-file.json',
-        );
-
-        fileInput.sendKeys(importJsonFile);
-
-        await driver.fill('#json-password-box', 'foobarbazqux');
-        await driver.clickElement(
-          '[data-testid="import-account-confirm-button"]',
-        );
-
-        const importedAccount = '0x0961Ca10D49B9B8e371aA0Bcf77fE5730b18f2E4';
-        await locateAccountBalanceDOM(driver, ganacheServer, importedAccount);
-        // New imported account has correct name and label
-        await driver.findClickableElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Account 4',
-        });
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-
-        await driver.findElement({
-          css: `.multichain-account-list-item--selected .multichain-account-list-item__content .mm-tag`,
-          text: 'Imported',
-        });
-
-        const accountListItems = await driver.findElements(
-          '.multichain-account-list-item',
-        );
-        assert.equal(accountListItems.length, 4);
-      },
-    );
-  });
-
-  it('Import Account using private key of an already active account should result in an error', async function () {
-    const testPrivateKey =
-      '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9';
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withKeyringControllerImportedAccountVault()
-          .withPreferencesControllerImportedAccountIdentities()
-          .withAccountsControllerImportedAccount()
-          .build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // choose Import Account from the account menu
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        // 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: 'Import account', tag: 'button' });
-
-        // enter private key
-        await driver.findClickableElement('#private-key-box');
-        await driver.fill('#private-key-box', testPrivateKey);
-        await driver.clickElement(
-          '[data-testid="import-account-confirm-button"]',
-        );
-
-        // error should occur
-        await driver.waitForSelector({
-          css: '.mm-help-text',
-          text: 'The account you are trying to import is a duplicate',
-        });
-      },
-    );
-  });
-
-  it('Connects to a Hardware wallet for lattice', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockTrezor,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // choose Connect hardware wallet from the account menu
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-
-        // 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.findClickableElement({
-          text: 'Continue',
-          tag: 'button',
-        });
-
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        const allWindows = await driver.waitUntilXWindowHandles(2);
-
-        assert.equal(allWindows.length, isManifestV3 ? 3 : 2);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/account/import-flow.spec.ts b/test/e2e/tests/account/import-flow.spec.ts
new file mode 100644
index 000000000000..8dc989db4d41
--- /dev/null
+++ b/test/e2e/tests/account/import-flow.spec.ts
@@ -0,0 +1,115 @@
+import path from 'path';
+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 { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
+
+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(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await completeImportSRPOnboardingFlow({
+          driver,
+          fillSrpWordByWord: true,
+        });
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+
+        // Open account details modal and check displayed account address
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_accountLabel('Account 1');
+        await headerNavbar.openAccountMenu();
+
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.openAccountDetailsModal('Account 1');
+        await accountListPage.check_addressInAccountDetailsModal(
+          testAddress.toLowerCase(),
+        );
+      },
+    );
+  });
+
+  it('Import Account using json file', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withKeyringControllerImportedAccountVault()
+          .withPreferencesControllerImportedAccountIdentities()
+          .withAccountsControllerImportedAccount()
+          .build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        // Wait until account list is loaded to mitigate race condition
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_accountLabel('Account 1');
+        await headerNavbar.openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+
+        // Imports an account with JSON file
+        const jsonFile = path.join(
+          __dirname,
+          '../..',
+          'import-utc-json',
+          'test-json-import-account-file.json',
+        );
+        await accountListPage.importAccountWithJsonFile(
+          jsonFile,
+          'foobarbazqux',
+        );
+
+        // Check new imported account has correct name and label
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+        await headerNavbar.check_accountLabel('Account 4');
+
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.check_numberOfAvailableAccounts(4);
+        await accountListPage.check_currentAccountIsImported();
+      },
+    );
+  });
+
+  it('Import Account using private key of an already active account should result in an error', async function () {
+    const testPrivateKey =
+      '0x53CB0AB5226EEBF4D872113D98332C1555DC304443BEE1CF759D15798D3C55A9';
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withKeyringControllerImportedAccountVault()
+          .build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.check_accountLabel('Account 1');
+        await headerNavbar.openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+
+        // import active account with private key from the account menu and check error message
+        await accountListPage.addNewImportedAccount(
+          testPrivateKey,
+          'The account you are trying to import is a duplicate',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/account/snap-account-transfers.spec.ts b/test/e2e/tests/account/snap-account-transfers.spec.ts
index 23cc5d510eb2..ee2466cf28e1 100644
--- a/test/e2e/tests/account/snap-account-transfers.spec.ts
+++ b/test/e2e/tests/account/snap-account-transfers.spec.ts
@@ -47,13 +47,13 @@ describe('Snap Account Transfers @no-mmi', function (this: Suite) {
         await headerNavbar.check_accountLabel('SSK Account');
 
         // send 1 ETH from snap account to account 1
-        await sendTransactionWithSnapAccount(
+        await sendTransactionWithSnapAccount({
           driver,
-          DEFAULT_FIXTURE_ACCOUNT,
-          '1',
-          '0.000042',
-          '1.000042',
-        );
+          recipientAddress: DEFAULT_FIXTURE_ACCOUNT,
+          amount: '1',
+          gasFee: '0.000042',
+          totalFee: '1.000042',
+        });
         await headerNavbar.check_pageIsLoaded();
         await headerNavbar.openAccountMenu();
         const accountList = new AccountListPage(driver);
@@ -95,14 +95,14 @@ describe('Snap Account Transfers @no-mmi', function (this: Suite) {
         await headerNavbar.check_accountLabel('SSK Account');
 
         // send 1 ETH from snap account to account 1 and approve the transaction
-        await sendTransactionWithSnapAccount(
+        await sendTransactionWithSnapAccount({
           driver,
-          DEFAULT_FIXTURE_ACCOUNT,
-          '1',
-          '0.000042',
-          '1.000042',
-          false,
-        );
+          recipientAddress: DEFAULT_FIXTURE_ACCOUNT,
+          amount: '1',
+          gasFee: '0.000042',
+          totalFee: '1.000042',
+          isSyncFlow: false,
+        });
         await headerNavbar.check_pageIsLoaded();
         await headerNavbar.openAccountMenu();
         const accountList = new AccountListPage(driver);
@@ -145,15 +145,15 @@ describe('Snap Account Transfers @no-mmi', function (this: Suite) {
         await headerNavbar.check_accountLabel('SSK Account');
 
         // send 1 ETH from snap account to account 1 and reject the transaction
-        await sendTransactionWithSnapAccount(
+        await sendTransactionWithSnapAccount({
           driver,
-          DEFAULT_FIXTURE_ACCOUNT,
-          '1',
-          '0.000042',
-          '1.000042',
-          false,
-          false,
-        );
+          recipientAddress: DEFAULT_FIXTURE_ACCOUNT,
+          amount: '1',
+          gasFee: '0.000042',
+          totalFee: '1.000042',
+          isSyncFlow: false,
+          approveTransaction: false,
+        });
 
         // check the transaction is failed in MetaMask activity list
         const homepage = new HomePage(driver);
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 7bacf156b71a..9cd1d3837729 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
@@ -144,8 +144,8 @@ async function createWalletInitiatedTransactionAndAssertDetails(
   await sendToPage.fillRecipient('0x2f318C334780961FB129D2a6c30D0763d9a5C970');
   await sendToPage.fillAmount('1');
 
-  await sendToPage.click_assetPickerButton();
-  await sendToPage.click_secondTokenListButton();
+  await sendToPage.clickAssetPickerButton();
+  await sendToPage.clickSecondTokenListButton();
   await sendToPage.goToNextScreen();
 
   const tokenTransferTransactionConfirmation =
diff --git a/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts b/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts
new file mode 100644
index 000000000000..b8497a9df692
--- /dev/null
+++ b/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts
@@ -0,0 +1,44 @@
+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 { isManifestV3 } from '../../../../shared/modules/mv3.utils';
+
+describe('Lattice hardware wallet @no-mmi', function (this: Suite) {
+  it('connects to lattice hardware wallet', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await unlockWallet(driver);
+
+        // choose Connect hardware wallet from the account menu
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+
+        // 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 allWindows = await driver.waitUntilXWindowHandles(2);
+        assert.equal(allWindows.length, isManifestV3 ? 3 : 2);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/privacy/basic-functionality.spec.js b/test/e2e/tests/privacy/basic-functionality.spec.js
index a945154f4bd3..e6439c569339 100644
--- a/test/e2e/tests/privacy/basic-functionality.spec.js
+++ b/test/e2e/tests/privacy/basic-functionality.spec.js
@@ -1,13 +1,10 @@
 const { strict: assert } = require('assert');
-const {
-  TEST_SEED_PHRASE,
-  withFixtures,
-  importSRPOnboardingFlow,
-  WALLET_PASSWORD,
-  defaultGanacheOptions,
-} = require('../../helpers');
+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 [
@@ -49,12 +46,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         testSpecificMock: mockApis,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
-        await importSRPOnboardingFlow(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
+        await importSRPOnboardingFlow({ driver });
 
         await driver.clickElement({
           text: 'Manage default privacy settings',
@@ -134,12 +126,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         testSpecificMock: mockApis,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await driver.navigate();
-        await importSRPOnboardingFlow(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
+        await importSRPOnboardingFlow({ driver });
 
         await driver.clickElement({
           text: 'Manage default privacy settings',
@@ -171,6 +158,8 @@ describe('MetaMask onboarding @no-mmi', function () {
         // Wait until network is fully switched and refresh tokens before asserting to mitigate flakiness
         await driver.assertElementNotPresent('.loading-overlay');
         await driver.clickElement('[data-testid="refresh-list-button"]');
+        // 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(
diff --git a/test/e2e/tests/transaction/simple-send.spec.ts b/test/e2e/tests/transaction/simple-send.spec.ts
index 0615a0e21d74..25f2368a9cfc 100644
--- a/test/e2e/tests/transaction/simple-send.spec.ts
+++ b/test/e2e/tests/transaction/simple-send.spec.ts
@@ -4,7 +4,7 @@ import { Ganache } from '../../seeder/ganache';
 import { withFixtures, defaultGanacheOptions } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import { sendTransaction } from '../../page-objects/flows/send-transaction.flow';
+import { sendTransactionToAddress } from '../../page-objects/flows/send-transaction.flow';
 import HomePage from '../../page-objects/pages/homepage';
 
 describe('Simple send eth', function (this: Suite) {
@@ -23,13 +23,13 @@ describe('Simple send eth', function (this: Suite) {
         ganacheServer?: Ganache;
       }) => {
         await loginWithBalanceValidation(driver, ganacheServer);
-        await sendTransaction(
+        await sendTransactionToAddress({
           driver,
-          '0x985c30949c92df7a0bd42e0f3e3d539ece98db24',
-          '1',
-          '0.000042',
-          '1.000042',
-        );
+          recipientAddress: '0x985c30949c92df7a0bd42e0f3e3d539ece98db24',
+          amount: '1',
+          gasFee: '0.000042',
+          totalFee: '1.000042',
+        });
         const homePage = new HomePage(driver);
         await homePage.check_pageIsLoaded();
         await homePage.check_confirmedTxNumberDisplayedInActivity();

From 4ba7d897635e9f0f1c3472dc42cf1c0e8fd58a2a Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Fri, 8 Nov 2024 16:21:20 +0000
Subject: [PATCH 064/111] fix: Return to send page with different asset types
 (#28382)
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 bug was reproducible by opening a new wallet initiated send
confirmation with a Native token ("simple send") from the extension full
screen view, and then triggering a dApp initiated confirmation, and
trying to return back to the send flow stepper.

The bug was provoked due to having the `editExistingTransaction` action
dispatched on back button click hardcoded for asset of type token. The
fix involves dynamically determining the asset type.

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

## **Related issues**

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

## **Manual testing steps**

See above or check video on the bug report ticket.

## **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.
---
 .../header/wallet-initiated-header.tsx        | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/header/wallet-initiated-header.tsx b/ui/pages/confirmations/components/confirm/header/wallet-initiated-header.tsx
index ffc8e7549faf..523e0206167d 100644
--- a/ui/pages/confirmations/components/confirm/header/wallet-initiated-header.tsx
+++ b/ui/pages/confirmations/components/confirm/header/wallet-initiated-header.tsx
@@ -1,4 +1,7 @@
-import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import React, { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
@@ -38,7 +41,26 @@ export const WalletInitiatedHeader = () => {
   const handleBackButtonClick = useCallback(async () => {
     const { id } = currentConfirmation;
 
-    await dispatch(editExistingTransaction(AssetType.token, id.toString()));
+    const isNativeSend =
+      currentConfirmation.type === TransactionType.simpleSend;
+    const isERC20TokenSend =
+      currentConfirmation.type === TransactionType.tokenMethodTransfer;
+    const isNFTTokenSend =
+      currentConfirmation.type === TransactionType.tokenMethodTransferFrom ||
+      currentConfirmation.type === TransactionType.tokenMethodSafeTransferFrom;
+
+    let assetType: AssetType;
+    if (isNativeSend) {
+      assetType = AssetType.native;
+    } else if (isERC20TokenSend) {
+      assetType = AssetType.token;
+    } else if (isNFTTokenSend) {
+      assetType = AssetType.NFT;
+    } else {
+      assetType = AssetType.unknown;
+    }
+
+    await dispatch(editExistingTransaction(assetType, id.toString()));
     dispatch(clearConfirmTransaction());
     dispatch(showSendTokenPage());
 

From d2ddf24445552fbde7ea7b59fca86ded69f07ffc Mon Sep 17 00:00:00 2001
From: Ulisses Ferreira <ulisses@hey.com>
Date: Fri, 8 Nov 2024 18:53:17 +0100
Subject: [PATCH 065/111] feat(Solana): add "Add a new Solana account" link to
 the account creation dialog (#28270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds a "Add a new Solana account" link to the account creation dialog:

## **Related issues**

Fixes:
[[SOL-24] [Setup] Add "Add a new Solana account (Beta)" button to the
account
picker](https://consensyssoftware.atlassian.net/browse/SOL-24?atlOrigin=eyJpIjoiYzhmNjk2NzVmZWM1NDFhNmI5NWZhMjc3YjkzM2I3OTIiLCJwIjoiaiJ9)

## **Manual testing steps**

1. Build and load the extension locally
2. Open the account picker
3. Click on "Add account or hardware wallet"
4. Click on "Add a new Solana wallet (Beta)"
5. A new Solana wallet should have been created, using the same seed
phrase used for Ethereum accounts

## **Screenshots/Recordings**

![Screenshot 2024-11-07 at 13 59
22](https://github.com/user-attachments/assets/15c51041-26ea-4ba4-b987-aed9ae57c277)


## **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.


[SOL-24]:
https://consensyssoftware.atlassian.net/browse/SOL-24?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

---------

Co-authored-by: Antonio Regadas <antonio.regadas@consensys.net>
Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com>
Co-authored-by: António Regadas <apregadas@gmail.com>
Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
---
 app/_locales/de/messages.json                 |  3 +
 app/_locales/el/messages.json                 |  3 +
 app/_locales/en/messages.json                 |  3 +
 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 +
 test/e2e/constants.ts                         |  7 ++
 .../account-list-menu/account-list-menu.tsx   | 64 +++++++++++++-
 .../useBitcoinWalletSnapClient.test.ts        | 57 ------------
 .../useMultichainWalletSnapClient.test.ts     | 87 +++++++++++++++++++
 ...nt.ts => useMultichainWalletSnapClient.ts} | 38 ++++++--
 21 files changed, 234 insertions(+), 67 deletions(-)
 delete mode 100644 ui/hooks/accounts/useBitcoinWalletSnapClient.test.ts
 create mode 100644 ui/hooks/accounts/useMultichainWalletSnapClient.test.ts
 rename ui/hooks/accounts/{useBitcoinWalletSnapClient.ts => useMultichainWalletSnapClient.ts} (60%)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index f62b15c08c93..e8de6564304b 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Ein neues Bitcoin-Konto hinzufügen (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Ein neues Solana-Konto hinzufügen (Beta)"
+  },
   "addNewToken": {
     "message": "Neues Token hinzufügen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 3bede7c85edb..5d2ba61516fa 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Προσθήκη νέου λογαριασμού Bitcoin (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Προσθήκη νέου λογαριασμού Solana (Beta)"
+  },
   "addNewToken": {
     "message": "Προσθήκη νέου token"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 56e3614e3f39..610ddba3a4dd 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -287,6 +287,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Add a new Bitcoin account (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Add a new Solana account (Beta)"
+  },
   "addNewToken": {
     "message": "Add new token"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 9ee7771947ba..92ad7c646a36 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -289,6 +289,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Add a new Bitcoin account (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Add a new Solana account (Beta)"
+  },
   "addNewToken": {
     "message": "Add new token"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index f13313976e74..604396f2c6eb 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Añadir una nueva cuenta de Bitcoin (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Añadir una nueva cuenta de Solana (Beta)"
+  },
   "addNewToken": {
     "message": "Agregar nuevo token"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index c785d2e0a00a..7c4db83af9e8 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Ajouter un nouveau compte Bitcoin (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Ajouter un nouveau compte Solana (Bêta)"
+  },
   "addNewToken": {
     "message": "Ajouter un nouveau jeton"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 554bb2e91b84..9f3800ef6b61 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "एक नया Bitcoin अकाउंट जोड़ें (टैस्टनेट (testnet))"
   },
+  "addNewSolanaAccount": {
+    "message": "एक नया Solana अकाउंट जोड़ें (बीटा)"
+  },
   "addNewToken": {
     "message": "नया टोकन जोड़ें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 8e60e6fe5a50..b070fb14cda9 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Tambahkan akun Bitcoin baru (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Tambahkan akun Solana baru (Beta)"
+  },
   "addNewToken": {
     "message": "Tambahkan token baru"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 69824ae33b52..ad77733372b6 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "新しいビットコインアカウントの追加 (テストネット)"
   },
+  "addNewSolanaAccount": {
+    "message": "新しいSolanaアカウントの追加 (ベータ版)"
+  },
   "addNewToken": {
     "message": "新しいトークンを追加"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index f160b3dccbc2..86077780926a 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "새 비트코인 계정 추가(테스트넷)"
   },
+  "addNewSolanaAccount": {
+    "message": "새 솔라나 계정 추가(베타)"
+  },
   "addNewToken": {
     "message": "신규 토큰 추가"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 589a58e94907..e868c22a817e 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Adicionar uma nova conta Bitcoin (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Adicionar uma nova conta Solana (Beta)"
+  },
   "addNewToken": {
     "message": "Adicionar novo token"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 9462d9c6eb4a..f995ce06a662 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Добавить новый счет в биткойнах (тестнет)"
   },
+  "addNewSolanaAccount": {
+    "message": "Добавить новый счет в Solana (бета-версия)"
+  },
   "addNewToken": {
     "message": "Добавить новый токен"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 41612a6ce177..f49c14518dc3 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Magdagdag ng bagong account sa Bitcoin (Testnet)"
   },
+  "addNewSolanaAccount": {
+    "message": "Magdagdag ng bagong account sa Solana (Beta)"
+  },
   "addNewToken": {
     "message": "Magdagdag ng bagong token"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index f11cc0d17523..7af54fd3eedd 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Yeni bir Bitcoin hesabı ekle (Test Ağı)"
   },
+  "addNewSolanaAccount": {
+    "message": "Yeni bir Solana hesabı ekle (Beta)"
+  },
   "addNewToken": {
     "message": "Yeni token ekleyin"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index dd518df1bf22..700d73f11649 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "Thêm tài khoản Bitcoin mới (Mạng thử nghiệm)"
   },
+  "addNewSolanaAccount": {
+    "message": "Thêm tài khoản Solana mới (Beta)"
+  },
   "addNewToken": {
     "message": "Thêm token mới"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 818f1ffdb82b..a24b993874a0 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -256,6 +256,9 @@
   "addNewBitcoinTestnetAccount": {
     "message": "添加新的比特币账户（测试网）"
   },
+  "addNewSolanaAccount": {
+    "message": "添加新的Solana账户（测试版）"
+  },
   "addNewToken": {
     "message": "添加新代币"
   },
diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index 8bf39d261bcb..a1388b93a512 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -50,3 +50,10 @@ export const DEFAULT_BTC_ACCOUNT = 'bc1qg6whd6pc0cguh6gpp3ewujm53hv32ta9hdp252';
 
 /* Default (mocked) BTC balance used by the Bitcoin RPC provider */
 export const DEFAULT_BTC_BALANCE = 1; // BTC
+
+/* Default (mocked) SOLANA address created using test SRP */
+export const DEFAULT_SOLANA_ACCOUNT =
+  'E6Aa9DDv7zsePJHosoqiNb3cFuup3fkXTyRH2pZ1nVzP';
+
+/* Default (mocked) SOLANA balance used by the Solana RPC provider */
+export const DEFAULT_SOLANA_BALANCE = 1; // SOL
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 cfb49d246ca6..75d04e9e60e0 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -68,6 +68,9 @@ import {
   getOriginOfCurrentTab,
   getSelectedInternalAccount,
   getUpdatedAndSortedAccounts,
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
+  getIsSolanaSupportEnabled,
+  ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
 import { setSelectedAccount } from '../../../store/actions';
 import {
@@ -97,8 +100,14 @@ import {
   hasCreatedBtcMainnetAccount,
   hasCreatedBtcTestnetAccount,
 } from '../../../selectors/accounts';
+///: END:ONLY_INCLUDE_IF
+
+///: BEGIN:ONLY_INCLUDE_IF(build-flask,solana)
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
-import { useBitcoinWalletSnapClient } from '../../../hooks/accounts/useBitcoinWalletSnapClient';
+import {
+  WalletClientType,
+  useMultichainWalletSnapClient,
+} from '../../../hooks/accounts/useMultichainWalletSnapClient';
 ///: END:ONLY_INCLUDE_IF
 import {
   InternalAccountWithBalance,
@@ -106,6 +115,12 @@ import {
   MergedInternalAccount,
 } from '../../../selectors/selectors.types';
 import { endTrace, TraceName } from '../../../../shared/lib/trace';
+///: BEGIN:ONLY_INCLUDE_IF(solana)
+import {
+  SOLANA_WALLET_NAME,
+  SOLANA_WALLET_SNAP_ID,
+} from '../../../../shared/lib/accounts/solana-wallet-snap';
+///: END:ONLY_INCLUDE_IF
 import { HiddenAccountList } from './hidden-account-list';
 
 const ACTION_MODES = {
@@ -269,7 +284,16 @@ export const AccountListMenu = ({
     hasCreatedBtcTestnetAccount,
   );
 
-  const bitcoinWalletSnapClient = useBitcoinWalletSnapClient();
+  const bitcoinWalletSnapClient = useMultichainWalletSnapClient(
+    WalletClientType.Bitcoin,
+  );
+  ///: END:ONLY_INCLUDE_IF
+
+  ///: BEGIN:ONLY_INCLUDE_IF(solana)
+  const solanaSupportEnabled = useSelector(getIsSolanaSupportEnabled);
+  const solanaWalletSnapClient = useMultichainWalletSnapClient(
+    WalletClientType.Solana,
+  );
   ///: END:ONLY_INCLUDE_IF
 
   const [searchQuery, setSearchQuery] = useState('');
@@ -453,6 +477,42 @@ export const AccountListMenu = ({
               ) : null
               ///: END:ONLY_INCLUDE_IF
             }
+            {
+              ///: BEGIN:ONLY_INCLUDE_IF(solana)
+              solanaSupportEnabled && (
+                <Box marginTop={4}>
+                  <ButtonLink
+                    size={ButtonLinkSize.Sm}
+                    startIconName={IconName.Add}
+                    onClick={async () => {
+                      trackEvent({
+                        category: MetaMetricsEventCategory.Navigation,
+                        event: MetaMetricsEventName.AccountAddSelected,
+                        properties: {
+                          account_type: MetaMetricsEventAccountType.Snap,
+                          snap_id: SOLANA_WALLET_SNAP_ID,
+                          snap_name: SOLANA_WALLET_NAME,
+                          location: 'Main Menu',
+                        },
+                      });
+
+                      // The account creation + renaming is handled by the
+                      // Snap account bridge, so we need to close the current
+                      // modal
+                      onClose();
+
+                      await solanaWalletSnapClient.createAccount(
+                        MultichainNetworks.SOLANA,
+                      );
+                    }}
+                    data-testid="multichain-account-menu-popover-add-solana-account"
+                  >
+                    {t('addNewSolanaAccount')}
+                  </ButtonLink>
+                </Box>
+              )
+              ///: END:ONLY_INCLUDE_IF
+            }
             <Box marginTop={4}>
               <ButtonLink
                 size={ButtonLinkSize.Sm}
diff --git a/ui/hooks/accounts/useBitcoinWalletSnapClient.test.ts b/ui/hooks/accounts/useBitcoinWalletSnapClient.test.ts
deleted file mode 100644
index 6032a7636128..000000000000
--- a/ui/hooks/accounts/useBitcoinWalletSnapClient.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { renderHook } from '@testing-library/react-hooks';
-import { HandlerType } from '@metamask/snaps-utils';
-import { BtcAccountType, BtcMethod } from '@metamask/keyring-api';
-import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
-import { BITCOIN_WALLET_SNAP_ID } from '../../../shared/lib/accounts/bitcoin-wallet-snap';
-import {
-  handleSnapRequest,
-  multichainUpdateBalance,
-} from '../../store/actions';
-import { useBitcoinWalletSnapClient } from './useBitcoinWalletSnapClient';
-
-jest.mock('../../store/actions', () => ({
-  handleSnapRequest: jest.fn(),
-  multichainUpdateBalance: jest.fn(),
-}));
-
-const mockHandleSnapRequest = handleSnapRequest as jest.Mock;
-const mockMultichainUpdateBalance = multichainUpdateBalance as jest.Mock;
-
-describe('useBitcoinWalletSnapClient', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  const mockAccount = {
-    address: 'tb1q2hjrlnf8kmtt5dj6e49gqzy6jnpe0sj7ty50cl',
-    id: '11a33c6b-0d46-43f4-a401-01587d575fd0',
-    options: {},
-    methods: [BtcMethod.SendMany],
-    type: BtcAccountType.P2wpkh,
-  };
-
-  it('dispatch a Snap keyring request to create a Bitcoin account', async () => {
-    const { result } = renderHook(() => useBitcoinWalletSnapClient());
-    const bitcoinWalletSnapClient = result.current;
-
-    mockHandleSnapRequest.mockResolvedValue(mockAccount);
-
-    await bitcoinWalletSnapClient.createAccount(MultichainNetworks.BITCOIN);
-    expect(mockHandleSnapRequest).toHaveBeenCalledWith({
-      origin: 'metamask',
-      snapId: BITCOIN_WALLET_SNAP_ID,
-      handler: HandlerType.OnKeyringRequest,
-      request: expect.any(Object),
-    });
-  });
-
-  it('force fetches the balance after creating a Bitcoin account', async () => {
-    const { result } = renderHook(() => useBitcoinWalletSnapClient());
-    const bitcoinWalletSnapClient = result.current;
-
-    mockHandleSnapRequest.mockResolvedValue(mockAccount);
-
-    await bitcoinWalletSnapClient.createAccount(MultichainNetworks.BITCOIN);
-    expect(mockMultichainUpdateBalance).toHaveBeenCalledWith(mockAccount.id);
-  });
-});
diff --git a/ui/hooks/accounts/useMultichainWalletSnapClient.test.ts b/ui/hooks/accounts/useMultichainWalletSnapClient.test.ts
new file mode 100644
index 000000000000..d177986fee44
--- /dev/null
+++ b/ui/hooks/accounts/useMultichainWalletSnapClient.test.ts
@@ -0,0 +1,87 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { HandlerType } from '@metamask/snaps-utils';
+import { BtcAccountType, BtcMethod } from '@metamask/keyring-api';
+import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
+import { BITCOIN_WALLET_SNAP_ID } from '../../../shared/lib/accounts/bitcoin-wallet-snap';
+import { SOLANA_WALLET_SNAP_ID } from '../../../shared/lib/accounts/solana-wallet-snap';
+import {
+  handleSnapRequest,
+  multichainUpdateBalance,
+} from '../../store/actions';
+import {
+  useMultichainWalletSnapClient,
+  WalletClientType,
+} from './useMultichainWalletSnapClient';
+
+jest.mock('../../store/actions', () => ({
+  handleSnapRequest: jest.fn(),
+  multichainUpdateBalance: jest.fn(),
+}));
+
+const mockHandleSnapRequest = handleSnapRequest as jest.Mock;
+const mockMultichainUpdateBalance = multichainUpdateBalance as jest.Mock;
+
+describe('useMultichainWalletSnapClient', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const testCases = [
+    {
+      clientType: WalletClientType.Bitcoin,
+      network: MultichainNetworks.BITCOIN,
+      snapId: BITCOIN_WALLET_SNAP_ID,
+      mockAccount: {
+        address: 'tb1q2hjrlnf8kmtt5dj6e49gqzy6jnpe0sj7ty50cl',
+        id: '11a33c6b-0d46-43f4-a401-01587d575fd0',
+        options: {},
+        methods: [BtcMethod.SendMany],
+        type: BtcAccountType.P2wpkh,
+      },
+    },
+    {
+      clientType: WalletClientType.Solana,
+      network: MultichainNetworks.SOLANA,
+      snapId: SOLANA_WALLET_SNAP_ID,
+      mockAccount: {
+        address: '4mip4tgbhxf8dpqvtb3zhzzapwfvznanhssqzgjyp7ha',
+        id: '22b44d7c-1e57-4b5b-8502-02698e686fd1',
+        options: {},
+        methods: ['someMethod'],
+        // TODO: Update when keyring-api is published with Solana types
+        type: BtcAccountType.P2wpkh,
+      },
+    },
+  ];
+
+  testCases.forEach(({ clientType, network, snapId, mockAccount }) => {
+    it(`dispatches a Snap keyring request to create a ${clientType} account`, async () => {
+      const { result } = renderHook(() =>
+        useMultichainWalletSnapClient(clientType),
+      );
+      const multichainWalletSnapClient = result.current;
+
+      mockHandleSnapRequest.mockResolvedValue(mockAccount);
+
+      await multichainWalletSnapClient.createAccount(network);
+      expect(mockHandleSnapRequest).toHaveBeenCalledWith({
+        origin: 'metamask',
+        snapId,
+        handler: HandlerType.OnKeyringRequest,
+        request: expect.any(Object),
+      });
+    });
+
+    it(`force fetches the balance after creating a ${clientType} account`, async () => {
+      const { result } = renderHook(() =>
+        useMultichainWalletSnapClient(clientType),
+      );
+      const multichainWalletSnapClient = result.current;
+
+      mockHandleSnapRequest.mockResolvedValue(mockAccount);
+
+      await multichainWalletSnapClient.createAccount(network);
+      expect(mockMultichainUpdateBalance).toHaveBeenCalledWith(mockAccount.id);
+    });
+  });
+});
diff --git a/ui/hooks/accounts/useBitcoinWalletSnapClient.ts b/ui/hooks/accounts/useMultichainWalletSnapClient.ts
similarity index 60%
rename from ui/hooks/accounts/useBitcoinWalletSnapClient.ts
rename to ui/hooks/accounts/useMultichainWalletSnapClient.ts
index debe911ac391..98dfa9b429d3 100644
--- a/ui/hooks/accounts/useBitcoinWalletSnapClient.ts
+++ b/ui/hooks/accounts/useMultichainWalletSnapClient.ts
@@ -1,32 +1,54 @@
 import { KeyringClient, Sender } from '@metamask/keyring-api';
 import { HandlerType } from '@metamask/snaps-utils';
 import { CaipChainId, Json, JsonRpcRequest } from '@metamask/utils';
+import { SnapId } from '@metamask/snaps-sdk';
 import { useMemo } from 'react';
 import {
   handleSnapRequest,
   multichainUpdateBalance,
 } from '../../store/actions';
 import { BITCOIN_WALLET_SNAP_ID } from '../../../shared/lib/accounts/bitcoin-wallet-snap';
+import { SOLANA_WALLET_SNAP_ID } from '../../../shared/lib/accounts/solana-wallet-snap';
+
+export enum WalletClientType {
+  Bitcoin = 'bitcoin-wallet-snap',
+  Solana = 'solana-wallet-snap',
+}
+
+const SNAP_ID_MAP: Record<WalletClientType, SnapId> = {
+  [WalletClientType.Bitcoin]: BITCOIN_WALLET_SNAP_ID,
+  [WalletClientType.Solana]: SOLANA_WALLET_SNAP_ID,
+};
+
+export class MultichainWalletSnapSender implements Sender {
+  private snapId: SnapId;
+
+  constructor(snapId: SnapId) {
+    this.snapId = snapId;
+  }
 
-export class BitcoinWalletSnapSender implements Sender {
   send = async (request: JsonRpcRequest): Promise<Json> => {
     // We assume the caller of this module is aware of this. If we try to use this module
     // without having the pre-installed Snap, this will likely throw an error in
     // the `handleSnapRequest` action.
     return (await handleSnapRequest({
       origin: 'metamask',
-      snapId: BITCOIN_WALLET_SNAP_ID,
+      snapId: this.snapId,
       handler: HandlerType.OnKeyringRequest,
       request,
     })) as Json;
   };
 }
 
-export class BitcoinWalletSnapClient {
+export class MultichainWalletSnapClient {
   readonly #client: KeyringClient;
 
-  constructor() {
-    this.#client = new KeyringClient(new BitcoinWalletSnapSender());
+  constructor(clientType: WalletClientType) {
+    const snapId = SNAP_ID_MAP[clientType];
+    if (!snapId) {
+      throw new Error(`Unsupported client type: ${clientType}`);
+    }
+    this.#client = new KeyringClient(new MultichainWalletSnapSender(snapId));
   }
 
   async createAccount(scope: CaipChainId) {
@@ -43,10 +65,10 @@ export class BitcoinWalletSnapClient {
   }
 }
 
-export function useBitcoinWalletSnapClient() {
+export function useMultichainWalletSnapClient(clientType: WalletClientType) {
   const client = useMemo(() => {
-    return new BitcoinWalletSnapClient();
-  }, []);
+    return new MultichainWalletSnapClient(clientType);
+  }, [clientType]);
 
   return client;
 }

From ab8df12ec325101e4bf7b8356a45e157d4168dbc Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 8 Nov 2024 09:56:58 -0800
Subject: [PATCH 066/111] chore: add unit test for `useMultiPolling` (#28387)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds a unit test for the `useMultiPolling`, and changes it to use refs
instead of state.

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

## **Related issues**


## **Manual testing steps**

No expected changes. ERC20 token prices should still be accurate when
switching, adding, and removing networks.

## **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.
---
 ui/hooks/useMultiPolling.test.ts | 46 ++++++++++++++++++++++++++++++++
 ui/hooks/useMultiPolling.ts      | 20 +++++---------
 2 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 ui/hooks/useMultiPolling.test.ts

diff --git a/ui/hooks/useMultiPolling.test.ts b/ui/hooks/useMultiPolling.test.ts
new file mode 100644
index 000000000000..a5621728c176
--- /dev/null
+++ b/ui/hooks/useMultiPolling.test.ts
@@ -0,0 +1,46 @@
+import { renderHook } from '@testing-library/react-hooks';
+
+import useMultiPolling from './useMultiPolling';
+
+describe('useMultiPolling', () => {
+  it('Should start/stop polling when inputs are added/removed, and stop on dismount', async () => {
+    const promises: Promise<string>[] = [];
+    const mockStartPolling = jest.fn().mockImplementation((input) => {
+      const promise = Promise.resolve(`${input}_token`);
+      promises.push(promise);
+      return promise;
+    });
+
+    const mockStopPollingByPollingToken = jest.fn();
+    const inputs = ['foo', 'bar'];
+
+    const { unmount, rerender } = renderHook(() =>
+      useMultiPolling({
+        startPolling: mockStartPolling,
+        stopPollingByPollingToken: mockStopPollingByPollingToken,
+        input: inputs,
+      }),
+    );
+
+    // All inputs should start polling
+    await Promise.all(promises);
+    for (const input of inputs) {
+      expect(mockStartPolling).toHaveBeenCalledWith(input);
+    }
+
+    // Remove one input, and add another
+    inputs[0] = 'baz';
+    rerender({ input: inputs });
+    expect(mockStopPollingByPollingToken).toHaveBeenCalledWith('foo_token');
+    expect(mockStartPolling).toHaveBeenCalledWith('baz');
+
+    // All inputs should stop polling on dismount
+    await Promise.all(promises);
+    unmount();
+    for (const input of inputs) {
+      expect(mockStopPollingByPollingToken).toHaveBeenCalledWith(
+        `${input}_token`,
+      );
+    }
+  });
+});
diff --git a/ui/hooks/useMultiPolling.ts b/ui/hooks/useMultiPolling.ts
index f0b3ed33cdfc..0eff48267221 100644
--- a/ui/hooks/useMultiPolling.ts
+++ b/ui/hooks/useMultiPolling.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef } from 'react';
 
 type UseMultiPollingOptions<PollingInput> = {
   startPolling: (input: PollingInput) => Promise<string>;
@@ -12,34 +12,28 @@ type UseMultiPollingOptions<PollingInput> = {
 const useMultiPolling = <PollingInput>(
   usePollingOptions: UseMultiPollingOptions<PollingInput>,
 ) => {
-  const [polls, setPolls] = useState(new Map());
+  const pollingTokens = useRef<Map<string, string>>(new Map());
 
   useEffect(() => {
     // start new polls
     for (const input of usePollingOptions.input) {
       const key = JSON.stringify(input);
-      if (!polls.has(key)) {
+      if (!pollingTokens.current.has(key)) {
         usePollingOptions
           .startPolling(input)
-          .then((token) =>
-            setPolls((prevPolls) => new Map(prevPolls).set(key, token)),
-          );
+          .then((token) => pollingTokens.current.set(key, token));
       }
     }
 
     // stop existing polls
-    for (const [inputKey, token] of polls.entries()) {
+    for (const [inputKey, token] of pollingTokens.current.entries()) {
       const exists = usePollingOptions.input.some(
         (i) => inputKey === JSON.stringify(i),
       );
 
       if (!exists) {
         usePollingOptions.stopPollingByPollingToken(token);
-        setPolls((prevPolls) => {
-          const newPolls = new Map(prevPolls);
-          newPolls.delete(inputKey);
-          return newPolls;
-        });
+        pollingTokens.current.delete(inputKey);
       }
     }
   }, [usePollingOptions.input && JSON.stringify(usePollingOptions.input)]);
@@ -47,7 +41,7 @@ const useMultiPolling = <PollingInput>(
   // stop all polling on dismount
   useEffect(() => {
     return () => {
-      for (const token of polls.values()) {
+      for (const token of pollingTokens.current.values()) {
         usePollingOptions.stopPollingByPollingToken(token);
       }
     };

From 3701940e9958a49d2998017ee2df31ec3f6a57d5 Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Mon, 11 Nov 2024 18:15:17 +0700
Subject: [PATCH 067/111] feat: change expand icon per new design (#28267)
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 the expand icon from left-right to up-down
Also moves the arrow to the left of the text

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

## **Related issues**

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

## **Manual testing steps**

1. Perform a swap on Uniswap and verify data is decoded into multiple
functions.
2. Check that the expanded rows have correct arrows per design

## **Screenshots/Recordings**

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

### **Before**

<img width="363" alt="image"
src="https://github.com/user-attachments/assets/40494159-1ed5-46ae-9c92-10c75aba4ac2">

### **After**

<img width="351" alt="image"
src="https://github.com/user-attachments/assets/8a78eb43-ac9c-4a41-8480-40c9c0283254">


## **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.
---
 .../expandable-row.test.tsx.snap              |  4 +-
 .../app/confirm/info/row/expandable-row.tsx   |  4 +-
 ui/components/app/confirm/info/row/index.scss |  2 +-
 .../transaction-data.test.tsx.snap            | 72 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/ui/components/app/confirm/info/row/__snapshots__/expandable-row.test.tsx.snap b/ui/components/app/confirm/info/row/__snapshots__/expandable-row.test.tsx.snap
index c3958d886710..3559558bc2cb 100644
--- a/ui/components/app/confirm/info/row/__snapshots__/expandable-row.test.tsx.snap
+++ b/ui/components/app/confirm/info/row/__snapshots__/expandable-row.test.tsx.snap
@@ -22,16 +22,16 @@ exports[`ConfirmInfoExpandableRow should match snapshot 1`] = `
     <div
       class="mm-box mm-box--display-flex"
     >
-      Expandable Value
       <button
         aria-label="expand"
         class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon mm-box--margin-left-1 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"
       >
         <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');"
+          style="mask-image: url('./images/icons/arrow-down.svg');"
         />
       </button>
+      Expandable Value
     </div>
   </div>
   <div
diff --git a/ui/components/app/confirm/info/row/expandable-row.tsx b/ui/components/app/confirm/info/row/expandable-row.tsx
index 23fa7f7d5fd0..a6e88fc17a81 100644
--- a/ui/components/app/confirm/info/row/expandable-row.tsx
+++ b/ui/components/app/confirm/info/row/expandable-row.tsx
@@ -40,19 +40,19 @@ export const ConfirmInfoExpandableRow = (
     <>
       <ConfirmInfoRow {...rowProps}>
         <Box display={Display.Flex}>
-          {children}
           <ButtonIcon
             marginLeft={1}
             className={classnames({
               expandIcon: true,
               expanded,
             })}
-            iconName={IconName.ArrowLeft}
+            iconName={IconName.ArrowDown}
             color={IconColor.primaryDefault}
             size={ButtonIconSize.Sm}
             onClick={handleClick}
             ariaLabel="expand"
           />
+          {children}
         </Box>
       </ConfirmInfoRow>
       <Box
diff --git a/ui/components/app/confirm/info/row/index.scss b/ui/components/app/confirm/info/row/index.scss
index 5595b900bf53..45f8ff356d8f 100644
--- a/ui/components/app/confirm/info/row/index.scss
+++ b/ui/components/app/confirm/info/row/index.scss
@@ -8,5 +8,5 @@
 }
 
 .expandIcon.expanded {
-  rotate: -90deg;
+  rotate: -180deg;
 }
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 1b7fd2aeb460..cc66da7a1375 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
@@ -57,6 +57,15 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
       <div
         class="mm-box mm-box--display-flex"
       >
+        <button
+          aria-label="expand"
+          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
+        >
+          <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-down.svg');"
+          />
+        </button>
         <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"
           data-testid="advanced-details-data-function"
@@ -68,15 +77,6 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
             WRAP_ETH
           </p>
         </div>
-        <button
-          aria-label="expand"
-          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
-        >
-          <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>
       </div>
     </div>
     <div
@@ -216,6 +216,15 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
       <div
         class="mm-box mm-box--display-flex"
       >
+        <button
+          aria-label="expand"
+          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
+        >
+          <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-down.svg');"
+          />
+        </button>
         <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"
           data-testid="advanced-details-data-function"
@@ -227,15 +236,6 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
             V3_SWAP_EXACT_IN
           </p>
         </div>
-        <button
-          aria-label="expand"
-          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
-        >
-          <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>
       </div>
     </div>
     <div
@@ -587,6 +587,15 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
       <div
         class="mm-box mm-box--display-flex"
       >
+        <button
+          aria-label="expand"
+          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
+        >
+          <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-down.svg');"
+          />
+        </button>
         <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"
           data-testid="advanced-details-data-function"
@@ -598,15 +607,6 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
             PAY_PORTION
           </p>
         </div>
-        <button
-          aria-label="expand"
-          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
-        >
-          <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>
       </div>
     </div>
     <div
@@ -802,6 +802,15 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
       <div
         class="mm-box mm-box--display-flex"
       >
+        <button
+          aria-label="expand"
+          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
+        >
+          <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-down.svg');"
+          />
+        </button>
         <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"
           data-testid="advanced-details-data-function"
@@ -813,15 +822,6 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
             SWEEP
           </p>
         </div>
-        <button
-          aria-label="expand"
-          class="mm-box mm-button-icon mm-button-icon--size-sm expandIcon expanded mm-box--margin-left-1 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"
-        >
-          <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>
       </div>
     </div>
     <div

From 6ae02e8e8a686903540490b3a98869071d1d4153 Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Mon, 11 Nov 2024 04:02:39 -0800
Subject: [PATCH 068/111] feat: migrate MetaMetricsController to
 BaseControllerV2 (#28113)
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 migrates MetaMetricsController 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/28113?quickstart=1)

## **Related issues**

Fixes: #25925

## **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
- [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.
---
 .../metametrics-controller.test.ts            | 1962 +++++++++++++++++
 ...tametrics.ts => metametrics-controller.ts} |  427 ++--
 .../metametrics-data-deletion.test.ts         |   30 +-
 .../metametrics-data-deletion.ts              |   29 +-
 app/scripts/controllers/metametrics.test.ts   | 1734 ---------------
 .../controllers/mmi-controller.test.ts        |  107 +-
 app/scripts/controllers/mmi-controller.ts     |    8 +-
 .../lib/createRPCMethodTrackingMiddleware.js  |    5 +-
 .../createRPCMethodTrackingMiddleware.test.js |   69 +-
 app/scripts/metamask-controller.js            |   46 +-
 shared/constants/metametrics.ts               |   29 +-
 shared/constants/mmi-controller.ts            |   11 +-
 ui/contexts/metametrics.js                    |    2 +-
 13 files changed, 2454 insertions(+), 2005 deletions(-)
 create mode 100644 app/scripts/controllers/metametrics-controller.test.ts
 rename app/scripts/controllers/{metametrics.ts => metametrics-controller.ts} (83%)
 delete mode 100644 app/scripts/controllers/metametrics.test.ts

diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
new file mode 100644
index 000000000000..4d12c06d0fd1
--- /dev/null
+++ b/app/scripts/controllers/metametrics-controller.test.ts
@@ -0,0 +1,1962 @@
+import { toHex } from '@metamask/controller-utils';
+import type {
+  NetworkClientId,
+  NetworkState,
+} from '@metamask/network-controller';
+import { NameEntry, NameType } from '@metamask/name-controller';
+import { AddressBookEntry } from '@metamask/address-book-controller';
+import {
+  Nft,
+  Token,
+  TokensControllerState,
+} from '@metamask/assets-controllers';
+import { InternalAccount } from '@metamask/keyring-api';
+import { Browser } from 'webextension-polyfill';
+import { ControllerMessenger } from '@metamask/base-controller';
+import { merge } from 'lodash';
+import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
+import { createSegmentMock } from '../lib/segment';
+import {
+  METAMETRICS_ANONYMOUS_ID,
+  METAMETRICS_BACKGROUND_PAGE_OBJECT,
+  MetaMetricsUserTrait,
+  MetaMetricsUserTraits,
+} from '../../../shared/constants/metametrics';
+import { CHAIN_IDS } from '../../../shared/constants/network';
+import { LedgerTransportTypes } from '../../../shared/constants/hardware-wallets';
+import * as Utils from '../lib/util';
+import { mockNetworkState } from '../../../test/stub/networks';
+import { flushPromises } from '../../../test/lib/timer-helpers';
+import MetaMetricsController, {
+  AllowedActions,
+  AllowedEvents,
+  MetaMetricsControllerOptions,
+} from './metametrics-controller';
+import {
+  getDefaultPreferencesControllerState,
+  PreferencesControllerState,
+} from './preferences-controller';
+
+const segmentMock = createSegmentMock(2);
+
+const VERSION = '0.0.1-test';
+const DEFAULT_CHAIN_ID = '0x1338';
+const LOCALE = 'en_US';
+const TEST_META_METRICS_ID = '0xabc';
+const TEST_GA_COOKIE_ID = '123456.123455';
+const DUMMY_ACTION_ID = 'DUMMY_ACTION_ID';
+const MOCK_EXTENSION_ID = 'testid';
+
+const MOCK_EXTENSION = {
+  runtime: {
+    id: MOCK_EXTENSION_ID,
+    setUninstallURL: () => undefined,
+  },
+} as unknown as Browser;
+
+const MOCK_TRAITS = {
+  test_boolean: true,
+  test_string: 'abc',
+  test_number: 123,
+  test_bool_array: [true, true, false],
+  test_string_array: ['test', 'test', 'test'],
+  test_boolean_array: [1, 2, 3],
+} as MetaMetricsUserTraits;
+
+const MOCK_INVALID_TRAITS = {
+  test_null: null,
+  test_array_multi_types: [true, 'a', 1],
+} as MetaMetricsUserTraits;
+
+const DEFAULT_TEST_CONTEXT = {
+  app: {
+    name: 'MetaMask Extension',
+    version: VERSION,
+    extensionId: MOCK_EXTENSION_ID,
+  },
+  page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+  referrer: undefined,
+  userAgent: window.navigator.userAgent,
+  marketingCampaignCookieId: null,
+};
+
+const DEFAULT_SHARED_PROPERTIES = {
+  chain_id: DEFAULT_CHAIN_ID,
+  locale: LOCALE.replace('_', '-'),
+  environment_type: 'background',
+};
+
+const DEFAULT_EVENT_PROPERTIES = {
+  category: 'Unit Test',
+  extensionId: MOCK_EXTENSION_ID,
+  ...DEFAULT_SHARED_PROPERTIES,
+};
+
+const DEFAULT_PAGE_PROPERTIES = {
+  ...DEFAULT_SHARED_PROPERTIES,
+};
+
+const SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT = {
+  id: 'transaction-submitted-0000',
+  canDeleteIfAbandoned: true,
+  category: 'Unit Test',
+  successEvent: 'Transaction Finalized',
+  persist: true,
+  properties: {
+    simulation_response: 'no_balance_change',
+    test_stored_prop: 1,
+  },
+};
+
+const SAMPLE_PERSISTED_EVENT_NO_ID = {
+  persist: true,
+  category: 'Unit Test',
+  successEvent: 'sample persisted event success',
+  failureEvent: 'sample persisted event failure',
+  properties: {
+    test: true,
+  },
+};
+
+const SAMPLE_PERSISTED_EVENT = {
+  id: 'testid',
+  ...SAMPLE_PERSISTED_EVENT_NO_ID,
+};
+
+const SAMPLE_NON_PERSISTED_EVENT = {
+  id: 'testid2',
+  persist: false,
+  category: 'Unit Test',
+  successEvent: 'sample non-persisted event success',
+  failureEvent: 'sample non-persisted event failure',
+  uniqueIdentifier: 'sample-non-persisted-event',
+  properties: {
+    test: true,
+  },
+};
+
+describe('MetaMetricsController', function () {
+  describe('constructor', function () {
+    it('should properly initialize', async function () {
+      const spy = jest.spyOn(segmentMock, 'track');
+      await withController(({ controller }) => {
+        expect(controller.version).toStrictEqual(VERSION);
+        expect(controller.chainId).toStrictEqual(DEFAULT_CHAIN_ID);
+        expect(controller.state.participateInMetaMetrics).toStrictEqual(true);
+        expect(controller.state.metaMetricsId).toStrictEqual(
+          TEST_META_METRICS_ID,
+        );
+        expect(controller.state.marketingCampaignCookieId).toStrictEqual(null);
+        expect(controller.locale).toStrictEqual(LOCALE.replace('_', '-'));
+        expect(controller.state.fragments).toStrictEqual({
+          testid: SAMPLE_PERSISTED_EVENT,
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'sample non-persisted event failure',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              test: true,
+            },
+            messageId: 'sample-non-persisted-event-failure',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should update when network changes', async function () {
+      const selectedNetworkClientId = 'selectedNetworkClientId2';
+      const selectedChainId = '0x222';
+      await withController(
+        {
+          mockNetworkClientConfigurationsByNetworkClientId: {
+            [selectedNetworkClientId]: {
+              chainId: selectedChainId,
+            },
+          },
+        },
+        ({ controller, triggerNetworkDidChange }) => {
+          triggerNetworkDidChange({
+            networkConfigurationsByChainId: {},
+            selectedNetworkClientId: 'selectedNetworkClientId2',
+            networksMetadata: {},
+          });
+
+          expect(controller.chainId).toStrictEqual(selectedChainId);
+        },
+      );
+    });
+
+    it('should update when preferences changes', async function () {
+      await withController(
+        {
+          currentLocale: LOCALE,
+        },
+        ({ controller, triggerPreferencesControllerStateChange }) => {
+          triggerPreferencesControllerStateChange({
+            ...getDefaultPreferencesControllerState(),
+            currentLocale: 'en_UK',
+          });
+          expect(controller.locale).toStrictEqual('en-UK');
+        },
+      );
+    });
+  });
+
+  describe('createEventFragment', function () {
+    it('should throw an error if the param is missing successEvent or category', async function () {
+      await withController(async ({ controller }) => {
+        await expect(() => {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error because we are testing the error case
+          controller.createEventFragment({ event: 'test' });
+        }).toThrow(/Must specify success event and category\./u);
+
+        await expect(() => {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error because we are testing the error case
+          controller.createEventFragment({ category: 'test' });
+        }).toThrow(/Must specify success event and category\./u);
+      });
+    });
+
+    it('should update fragments state with new fragment', async function () {
+      await withController(({ controller }) => {
+        jest.useFakeTimers().setSystemTime(1730798301422);
+        const mockNewId = 'testid3';
+
+        controller.createEventFragment({
+          ...SAMPLE_PERSISTED_EVENT_NO_ID,
+          uniqueIdentifier: mockNewId,
+        });
+
+        const resultFragment = controller.state.fragments[mockNewId];
+
+        expect(resultFragment).toStrictEqual({
+          ...SAMPLE_PERSISTED_EVENT_NO_ID,
+          id: mockNewId,
+          uniqueIdentifier: mockNewId,
+          lastUpdated: 1730798301422,
+        });
+      });
+    });
+
+    it('should track the initial event if provided', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'track');
+          const mockInitialEventName = 'Test Initial Event';
+
+          controller.createEventFragment({
+            ...SAMPLE_PERSISTED_EVENT_NO_ID,
+            initialEvent: mockInitialEventName,
+          });
+
+          expect(spy).toHaveBeenCalledTimes(1);
+        },
+      );
+    });
+
+    it('should not call track if no initialEvent was provided', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'track');
+
+          controller.createEventFragment({
+            ...SAMPLE_PERSISTED_EVENT_NO_ID,
+          });
+
+          expect(spy).toHaveBeenCalledTimes(0);
+        },
+      );
+    });
+
+    describe('when intialEvent is "Transaction Submitted" and a fragment exists before createEventFragment is called', function () {
+      it('should update existing fragment state with new fragment props', async function () {
+        await withController(({ controller }) => {
+          jest.useFakeTimers().setSystemTime(1730798302222);
+          const { id } = SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT;
+
+          controller.updateEventFragment(
+            SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT.id,
+            {
+              ...SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
+            },
+          );
+          controller.createEventFragment({
+            ...SAMPLE_PERSISTED_EVENT_NO_ID,
+            initialEvent: 'Transaction Submitted',
+            uniqueIdentifier: id,
+          });
+
+          const expectedFragment = merge(
+            SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
+            SAMPLE_PERSISTED_EVENT_NO_ID,
+            {
+              canDeleteIfAbandoned: false,
+              id,
+              initialEvent: 'Transaction Submitted',
+              uniqueIdentifier: id,
+              lastUpdated: 1730798302222,
+            },
+          );
+
+          expect(controller.state.fragments[id]).toStrictEqual(
+            expectedFragment,
+          );
+        });
+      });
+    });
+  });
+
+  describe('updateEventFragment', function () {
+    it('updates fragment with additional provided props', async function () {
+      await withController(({ controller }) => {
+        jest.useFakeTimers().setSystemTime(1730798303333);
+
+        const MOCK_PROPS_TO_UPDATE = {
+          properties: {
+            test: 1,
+          },
+        };
+
+        controller.updateEventFragment(
+          SAMPLE_PERSISTED_EVENT.id,
+          MOCK_PROPS_TO_UPDATE,
+        );
+
+        const expectedPartialFragment = {
+          ...SAMPLE_PERSISTED_EVENT,
+          ...MOCK_PROPS_TO_UPDATE,
+          lastUpdated: 1730798303333,
+        };
+
+        expect(
+          controller.state.fragments[SAMPLE_PERSISTED_EVENT.id],
+        ).toStrictEqual(expectedPartialFragment);
+      });
+    });
+
+    it('throws error when no existing fragment exists', async function () {
+      await withController(async ({ controller }) => {
+        jest.useFakeTimers().setSystemTime(1730798303333);
+
+        const MOCK_NONEXISTING_ID = 'test-nonexistingid';
+
+        await expect(() => {
+          controller.updateEventFragment(MOCK_NONEXISTING_ID, {
+            properties: { test: 1 },
+          });
+        }).toThrow(
+          /Event fragment with id test-nonexistingid does not exist\./u,
+        );
+
+        jest.useRealTimers();
+      });
+    });
+
+    describe('when id includes "transaction-submitted"', function () {
+      it('creates and stores new fragment props with canDeleteIfAbandoned set to true', async function () {
+        await withController(({ controller }) => {
+          jest.useFakeTimers().setSystemTime(1730798303333);
+          const MOCK_ID = 'transaction-submitted-1111';
+          const MOCK_PROPS_TO_UPDATE = {
+            properties: {
+              test: 1,
+            },
+          };
+
+          controller.updateEventFragment(MOCK_ID, MOCK_PROPS_TO_UPDATE);
+
+          const resultFragment = controller.state.fragments[MOCK_ID];
+          const expectedPartialFragment = {
+            ...MOCK_PROPS_TO_UPDATE,
+            category: 'Transactions',
+            canDeleteIfAbandoned: true,
+            id: MOCK_ID,
+            lastUpdated: 1730798303333,
+            successEvent: 'Transaction Finalized',
+          };
+          expect(resultFragment).toStrictEqual(expectedPartialFragment);
+
+          jest.useRealTimers();
+        });
+      });
+    });
+  });
+
+  describe('generateMetaMetricsId', function () {
+    it('should generate an 0x prefixed hex string', async function () {
+      await withController(({ controller }) => {
+        expect(
+          controller.generateMetaMetricsId().startsWith('0x'),
+        ).toStrictEqual(true);
+      });
+    });
+  });
+
+  describe('getMetaMetricsId', function () {
+    it('should generate or return the metametrics id', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: null,
+            },
+          },
+        },
+        ({ controller }) => {
+          // Starts off being empty.
+          expect(controller.state.metaMetricsId).toStrictEqual(null);
+
+          // Create a new metametrics id.
+          const clientMetaMetricsId = controller.getMetaMetricsId();
+          expect(clientMetaMetricsId.startsWith('0x')).toStrictEqual(true);
+
+          // Return same metametrics id.
+          const sameMetaMetricsId = controller.getMetaMetricsId();
+          expect(clientMetaMetricsId).toStrictEqual(sameMetaMetricsId);
+        },
+      );
+    });
+  });
+
+  describe('identify', function () {
+    it('should call segment.identify for valid traits if user is participating in metametrics', async function () {
+      const spy = jest.spyOn(segmentMock, 'identify');
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: TEST_META_METRICS_ID,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.identify({
+            ...MOCK_TRAITS,
+            ...MOCK_INVALID_TRAITS,
+          });
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              userId: TEST_META_METRICS_ID,
+              traits: MOCK_TRAITS,
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+
+    it('should transform date type traits into ISO-8601 timestamp strings', async function () {
+      const spy = jest.spyOn(segmentMock, 'identify');
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: TEST_META_METRICS_ID,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.identify({
+            test_date: new Date().toISOString(),
+          } as MetaMetricsUserTraits);
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              userId: TEST_META_METRICS_ID,
+              traits: {
+                test_date: new Date().toISOString(),
+              },
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+
+    it('should not call segment.identify if user is not participating in metametrics', async function () {
+      const spy = jest.spyOn(segmentMock, 'identify');
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: false,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.identify(MOCK_TRAITS);
+          expect(spy).toHaveBeenCalledTimes(0);
+        },
+      );
+    });
+
+    it('should not call segment.identify if there are no valid traits to identify', async function () {
+      const spy = jest.spyOn(segmentMock, 'identify');
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: TEST_META_METRICS_ID,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.identify(MOCK_INVALID_TRAITS);
+          expect(spy).toHaveBeenCalledTimes(0);
+        },
+      );
+    });
+  });
+
+  describe('setParticipateInMetaMetrics', function () {
+    it('should update the value of participateInMetaMetrics', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: null,
+              metaMetricsId: null,
+            },
+          },
+        },
+        async ({ controller }) => {
+          expect(controller.state.participateInMetaMetrics).toStrictEqual(null);
+          await controller.setParticipateInMetaMetrics(true);
+          expect(controller.state.participateInMetaMetrics).toStrictEqual(true);
+          await controller.setParticipateInMetaMetrics(false);
+          expect(controller.state.participateInMetaMetrics).toStrictEqual(
+            false,
+          );
+        },
+      );
+    });
+    it('should generate and update the metaMetricsId when set to true', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: null,
+              metaMetricsId: null,
+            },
+          },
+        },
+        async ({ controller }) => {
+          expect(controller.state.metaMetricsId).toStrictEqual(null);
+          await controller.setParticipateInMetaMetrics(true);
+          expect(typeof controller.state.metaMetricsId).toStrictEqual('string');
+        },
+      );
+    });
+    it('should not nullify the metaMetricsId when set to false', async function () {
+      await withController(async ({ controller }) => {
+        await controller.setParticipateInMetaMetrics(false);
+        expect(controller.state.metaMetricsId).toStrictEqual(
+          TEST_META_METRICS_ID,
+        );
+      });
+    });
+    it('should nullify the marketingCampaignCookieId when participateInMetaMetrics is toggled off', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: TEST_META_METRICS_ID,
+              dataCollectionForMarketing: true,
+              marketingCampaignCookieId: TEST_GA_COOKIE_ID,
+            },
+          },
+        },
+        async ({ controller }) => {
+          expect(controller.state.marketingCampaignCookieId).toStrictEqual(
+            TEST_GA_COOKIE_ID,
+          );
+          await controller.setParticipateInMetaMetrics(false);
+          expect(controller.state.marketingCampaignCookieId).toStrictEqual(
+            null,
+          );
+        },
+      );
+    });
+  });
+
+  describe('trackEvent', function () {
+    it('should not track an event if user is not participating in metametrics', async function () {
+      const spy = jest.spyOn(segmentMock, 'track');
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: false,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.trackEvent({
+            event: 'Fake Event',
+            category: 'Unit Test',
+            properties: {
+              chain_id: '1',
+            },
+          });
+          expect(spy).toHaveBeenCalledTimes(0);
+        },
+      );
+    });
+
+    it('should track an event if user has not opted in, but isOptIn is true', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'track');
+          controller.trackEvent(
+            {
+              event: 'Fake Event',
+              category: 'Unit Test',
+              properties: {
+                chain_id: '1',
+              },
+            },
+            { isOptIn: true },
+          );
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              event: 'Fake Event',
+              anonymousId: METAMETRICS_ANONYMOUS_ID,
+              context: DEFAULT_TEST_CONTEXT,
+              properties: {
+                ...DEFAULT_EVENT_PROPERTIES,
+                chain_id: '1',
+              },
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+
+    it('should track an event during optin and allow for metaMetricsId override', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'track');
+          controller.trackEvent(
+            {
+              event: 'Fake Event',
+              category: 'Unit Test',
+              properties: {
+                chain_id: '1',
+              },
+            },
+            { isOptIn: true, metaMetricsId: 'TESTID' },
+          );
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              event: 'Fake Event',
+              userId: 'TESTID',
+              context: DEFAULT_TEST_CONTEXT,
+              properties: {
+                ...DEFAULT_EVENT_PROPERTIES,
+                chain_id: '1',
+              },
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+
+    it('should track a legacy event', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent(
+          {
+            event: 'Fake Event',
+            category: 'Unit Test',
+            properties: {
+              chain_id: '1',
+            },
+          },
+          { matomoEvent: true },
+        );
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              legacy_event: true,
+              chain_id: '1',
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should track a non legacy event', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          properties: {
+            chain_id: '1',
+          },
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              chain_id: '1',
+            },
+            context: DEFAULT_TEST_CONTEXT,
+            userId: TEST_META_METRICS_ID,
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should immediately flush queue if flushImmediately set to true', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'flush');
+        controller.trackEvent(
+          {
+            event: 'Fake Event',
+            category: 'Unit Test',
+          },
+          { flushImmediately: true },
+        );
+        expect(spy).not.toThrow();
+      });
+    });
+
+    it('should throw if event or category not provided', async function () {
+      await withController(({ controller }) => {
+        expect(() => {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error because we are testing the error case
+          controller.trackEvent({ event: 'test' });
+        }).toThrow(/Must specify event and category\./u);
+
+        expect(() => {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error because we are testing the error case
+          controller.trackEvent({ category: 'test' });
+        }).toThrow(/Must specify event and category\./u);
+      });
+    });
+
+    it('should throw if provided sensitiveProperties, when excludeMetaMetricsId is true', async function () {
+      const captureExceptionMock = jest.fn();
+      await withController(
+        {
+          options: {
+            captureException: captureExceptionMock,
+          },
+        },
+        async ({ controller }) => {
+          controller.trackEvent(
+            {
+              event: 'Fake Event',
+              category: 'Unit Test',
+              sensitiveProperties: { foo: 'bar' },
+            },
+            { excludeMetaMetricsId: true },
+          );
+          await flushPromises();
+          expect(captureExceptionMock).toHaveBeenCalledWith(
+            new Error(
+              'sensitiveProperties was specified in an event payload that also set the excludeMetaMetricsId flag',
+            ),
+          );
+        },
+      );
+    });
+
+    it('should track sensitiveProperties in a separate, anonymous event', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: DEFAULT_EVENT_PROPERTIES,
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[1][1],
+        );
+      });
+    });
+  });
+
+  describe('Change Signature XXX anonymous event names', function () {
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ['Signature Requested', 'Signature Requested Anon'],
+      ['Signature Rejected', 'Signature Rejected Anon'],
+      ['Signature Approved', 'Signature Approved Anon'],
+    ])(
+      'should change "%s" anonymous event names to "%s"',
+      async (eventType: string, anonEventType: string) => {
+        await withController(({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'track');
+          controller.trackEvent({
+            event: eventType,
+            category: 'Unit Test',
+            properties: DEFAULT_EVENT_PROPERTIES,
+            sensitiveProperties: { foo: 'bar' },
+          });
+
+          expect(spy).toHaveBeenCalledTimes(2);
+
+          expect(spy.mock.calls[0][0]).toMatchObject({
+            event: anonEventType,
+            properties: { foo: 'bar', ...DEFAULT_EVENT_PROPERTIES },
+          });
+
+          expect(spy.mock.calls[1][0]).toMatchObject({
+            event: eventType,
+            properties: { ...DEFAULT_EVENT_PROPERTIES },
+          });
+        });
+      },
+    );
+  });
+
+  describe('Change Transaction XXX anonymous event namnes', function () {
+    it('should change "Transaction Added" anonymous event names to "Transaction Added Anon"', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Transaction Added',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: `Transaction Added Anon`,
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should change "Transaction Submitted" anonymous event names to "Transaction Added Anon"', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Transaction Submitted',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: `Transaction Submitted Anon`,
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should change "Transaction Finalized" anonymous event names to "Transaction Added Anon"', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Transaction Finalized',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: `Transaction Finalized Anon`,
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+  });
+
+  describe('trackPage', function () {
+    it('should track a page view', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'page');
+        controller.trackPage({
+          name: 'home',
+          environmentType: ENVIRONMENT_TYPE_BACKGROUND,
+          page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            name: 'home',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              params: undefined,
+              ...DEFAULT_PAGE_PROPERTIES,
+            },
+            messageId: Utils.generateRandomId(),
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should not track a page view if user is not participating in metametrics', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: false,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'page');
+          controller.trackPage({
+            name: 'home',
+            environmentType: ENVIRONMENT_TYPE_BACKGROUND,
+            page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+          });
+          expect(spy).toHaveBeenCalledTimes(0);
+        },
+      );
+    });
+
+    it('should track a page view if isOptInPath is true and user not yet opted in', async function () {
+      await withController(
+        {
+          currentLocale: LOCALE,
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'page');
+          controller.trackPage(
+            {
+              name: 'home',
+              environmentType: ENVIRONMENT_TYPE_BACKGROUND,
+              page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+            },
+            { isOptInPath: true },
+          );
+
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              name: 'home',
+              userId: TEST_META_METRICS_ID,
+              context: DEFAULT_TEST_CONTEXT,
+              properties: {
+                ...DEFAULT_PAGE_PROPERTIES,
+              },
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+
+    it('multiple trackPage call with same actionId should result in same messageId being sent to segment', async function () {
+      await withController(
+        {
+          currentLocale: LOCALE,
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          const spy = jest.spyOn(segmentMock, 'page');
+          controller.trackPage(
+            {
+              name: 'home',
+              actionId: DUMMY_ACTION_ID,
+              environmentType: ENVIRONMENT_TYPE_BACKGROUND,
+              page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+            },
+            { isOptInPath: true },
+          );
+          controller.trackPage(
+            {
+              name: 'home',
+              actionId: DUMMY_ACTION_ID,
+              environmentType: ENVIRONMENT_TYPE_BACKGROUND,
+              page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
+            },
+            { isOptInPath: true },
+          );
+
+          expect(spy).toHaveBeenCalledTimes(2);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              name: 'home',
+              userId: TEST_META_METRICS_ID,
+              context: DEFAULT_TEST_CONTEXT,
+              properties: DEFAULT_PAGE_PROPERTIES,
+              messageId: DUMMY_ACTION_ID,
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+  });
+
+  describe('deterministic messageId', function () {
+    it('should use the actionId as messageId when provided', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          properties: {
+            chain_id: 'bar',
+          },
+          actionId: '0x001',
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              chain_id: 'bar',
+            },
+            messageId: '0x001',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should append 0x000 to the actionId of anonymized event when tracking sensitiveProperties', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+          actionId: '0x001',
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: '0x001-0x000',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: DEFAULT_EVENT_PROPERTIES,
+            messageId: '0x001',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[1][1],
+        );
+      });
+    });
+
+    it('should use the uniqueIdentifier as messageId when provided', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          properties: {
+            chain_id: 'bar',
+          },
+          uniqueIdentifier: 'transaction-submitted-0000',
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              chain_id: 'bar',
+            },
+            messageId: 'transaction-submitted-0000',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should append 0x000 to the uniqueIdentifier of anonymized event when tracking sensitiveProperties', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+          uniqueIdentifier: 'transaction-submitted-0000',
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: 'transaction-submitted-0000-0x000',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: 'transaction-submitted-0000',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[1][1],
+        );
+      });
+    });
+
+    it('should combine the uniqueIdentifier and actionId as messageId when both provided', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          properties: { chain_id: 'bar' },
+          actionId: '0x001',
+          uniqueIdentifier: 'transaction-submitted-0000',
+        });
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+              chain_id: 'bar',
+            },
+            messageId: 'transaction-submitted-0000-0x001',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+      });
+    });
+
+    it('should append 0x000 to the combined uniqueIdentifier and actionId of anonymized event when tracking sensitiveProperties', async function () {
+      await withController(({ controller }) => {
+        const spy = jest.spyOn(segmentMock, 'track');
+        controller.trackEvent({
+          event: 'Fake Event',
+          category: 'Unit Test',
+          sensitiveProperties: { foo: 'bar' },
+          actionId: '0x001',
+          uniqueIdentifier: 'transaction-submitted-0000',
+        });
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            anonymousId: METAMETRICS_ANONYMOUS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              foo: 'bar',
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: 'transaction-submitted-0000-0x001-0x000',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[0][1],
+        );
+        expect(spy).toHaveBeenCalledWith(
+          {
+            event: 'Fake Event',
+            userId: TEST_META_METRICS_ID,
+            context: DEFAULT_TEST_CONTEXT,
+            properties: {
+              ...DEFAULT_EVENT_PROPERTIES,
+            },
+            messageId: 'transaction-submitted-0000-0x001',
+            timestamp: new Date(),
+          },
+          spy.mock.calls[1][1],
+        );
+      });
+    });
+  });
+
+  describe('_buildUserTraitsObject', function () {
+    it('should return full user traits object on first call', async function () {
+      const MOCK_ALL_TOKENS: TokensControllerState['allTokens'] = {
+        [toHex(1)]: {
+          '0x1235ce91d74254f29d4609f25932fe6d97bf4842': [
+            {
+              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
+            },
+            {
+              address: '0xabc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
+            },
+          ] as Token[],
+          '0xe364b0f9d1879e53e8183055c9d7dd2b7375d86b': [
+            {
+              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
+            },
+          ] as Token[],
+        },
+        [toHex(4)]: {
+          '0x1235ce91d74254f29d4609f25932fe6d97bf4842': [
+            {
+              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
+            },
+            {
+              address: '0x12317F958D2ee523a2206206994597C13D831ec7',
+            },
+          ] as Token[],
+        },
+      };
+
+      await withController(({ controller }) => {
+        const traits = controller._buildUserTraitsObject({
+          addressBook: {
+            [CHAIN_IDS.MAINNET]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+            },
+            [CHAIN_IDS.GOERLI]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x0': {
+                address: '0x0',
+              } as AddressBookEntry,
+            },
+          },
+          allNfts: {
+            '0xac706cE8A9BF27Afecf080fB298d0ee13cfb978A': {
+              [toHex(56)]: [
+                {
+                  address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
+                  tokenId: '100',
+                },
+                {
+                  address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
+                  tokenId: '101',
+                },
+                {
+                  address: '0x7488d2ce5deb26db021285b50b661d655eb3d3d9',
+                  tokenId: '99',
+                },
+              ] as Nft[],
+            },
+            '0xe04AB39684A24D8D4124b114F3bd6FBEB779cacA': {
+              [toHex(59)]: [
+                {
+                  address: '0x63d646bc7380562376d5de205123a57b1718184d',
+                  tokenId: '14',
+                },
+              ] as Nft[],
+            },
+          },
+          allTokens: MOCK_ALL_TOKENS,
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.GOERLI },
+            { chainId: '0xaf' },
+          ),
+          internalAccounts: {
+            accounts: {
+              mock1: {} as InternalAccount,
+              mock2: {} as InternalAccount,
+            },
+            selectedAccount: 'mock1',
+          },
+          ledgerTransportType: LedgerTransportTypes.webhid,
+          openSeaEnabled: true,
+          useNftDetection: false,
+          securityAlertsEnabled: true,
+          theme: 'default',
+          useTokenDetection: true,
+          ShowNativeTokenAsMainBalance: true,
+          security_providers: [],
+          names: {
+            [NameType.ETHEREUM_ADDRESS]: {
+              '0x123': {
+                '0x1': {
+                  name: 'Test 1',
+                } as NameEntry,
+                '0x2': {
+                  name: 'Test 2',
+                } as NameEntry,
+                '0x3': {
+                  name: null,
+                } as NameEntry,
+              },
+              '0x456': {
+                '0x1': {
+                  name: 'Test 3',
+                } as NameEntry,
+              },
+              '0x789': {
+                '0x1': {
+                  name: null,
+                } as NameEntry,
+              },
+            },
+          },
+          tokenSortConfig: {
+            key: 'token-sort-key',
+            order: 'dsc',
+            sortCallback: 'stringNumeric',
+          },
+          participateInMetaMetrics: true,
+          currentCurrency: 'usd',
+          dataCollectionForMarketing: false,
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          custodyAccountDetails: {},
+          ///: END:ONLY_INCLUDE_IF
+        });
+
+        expect(traits).toStrictEqual({
+          [MetaMetricsUserTrait.AddressBookEntries]: 3,
+          [MetaMetricsUserTrait.InstallDateExt]: '',
+          [MetaMetricsUserTrait.LedgerConnectionType]:
+            LedgerTransportTypes.webhid,
+          [MetaMetricsUserTrait.NetworksAdded]: [
+            CHAIN_IDS.MAINNET,
+            CHAIN_IDS.GOERLI,
+            '0xaf',
+          ],
+          [MetaMetricsUserTrait.NetworksWithoutTicker]: ['0xaf'],
+          [MetaMetricsUserTrait.NftAutodetectionEnabled]: false,
+          [MetaMetricsUserTrait.NumberOfAccounts]: 2,
+          [MetaMetricsUserTrait.NumberOfNftCollections]: 3,
+          [MetaMetricsUserTrait.NumberOfNfts]: 4,
+          [MetaMetricsUserTrait.NumberOfTokens]: 5,
+          [MetaMetricsUserTrait.OpenSeaApiEnabled]: true,
+          [MetaMetricsUserTrait.ThreeBoxEnabled]: false,
+          [MetaMetricsUserTrait.Theme]: 'default',
+          [MetaMetricsUserTrait.TokenDetectionEnabled]: true,
+          [MetaMetricsUserTrait.ShowNativeTokenAsMainBalance]: true,
+          [MetaMetricsUserTrait.CurrentCurrency]: 'usd',
+          [MetaMetricsUserTrait.HasMarketingConsent]: false,
+          [MetaMetricsUserTrait.SecurityProviders]: ['blockaid'],
+          [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          [MetaMetricsUserTrait.MmiExtensionId]: 'testid',
+          [MetaMetricsUserTrait.MmiAccountAddress]: null,
+          [MetaMetricsUserTrait.MmiIsCustodian]: false,
+          ///: END:ONLY_INCLUDE_IF
+          ///: BEGIN:ONLY_INCLUDE_IF(petnames)
+          [MetaMetricsUserTrait.PetnameAddressCount]: 3,
+          ///: END:ONLY_INCLUDE_IF
+          [MetaMetricsUserTrait.TokenSortPreference]: 'token-sort-key',
+        });
+      });
+    });
+
+    it('should return only changed traits object on subsequent calls', async function () {
+      await withController(({ controller }) => {
+        const networkState = mockNetworkState(
+          { chainId: CHAIN_IDS.MAINNET },
+          { chainId: CHAIN_IDS.GOERLI },
+        );
+        controller._buildUserTraitsObject({
+          addressBook: {
+            [CHAIN_IDS.MAINNET]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+            },
+            [CHAIN_IDS.GOERLI]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x0': {
+                address: '0x0',
+              } as AddressBookEntry,
+            },
+          },
+          allTokens: {},
+          ...networkState,
+          ledgerTransportType: LedgerTransportTypes.webhid,
+          openSeaEnabled: true,
+          internalAccounts: {
+            accounts: {
+              mock1: {} as InternalAccount,
+              mock2: {} as InternalAccount,
+            },
+            selectedAccount: 'mock1',
+          },
+          useNftDetection: false,
+          theme: 'default',
+          useTokenDetection: true,
+          tokenSortConfig: {
+            key: 'token-sort-key',
+            order: 'dsc',
+            sortCallback: 'stringNumeric',
+          },
+          ShowNativeTokenAsMainBalance: true,
+          allNfts: {},
+          participateInMetaMetrics: true,
+          dataCollectionForMarketing: false,
+          securityAlertsEnabled: true,
+          names: {
+            ethereumAddress: {},
+          },
+          security_providers: ['blockaid'],
+          currentCurrency: 'usd',
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          custodyAccountDetails: {},
+          ///: END:ONLY_INCLUDE_IF
+        });
+
+        const updatedTraits = controller._buildUserTraitsObject({
+          addressBook: {
+            [CHAIN_IDS.MAINNET]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x1': {
+                address: '0x1',
+              } as AddressBookEntry,
+            },
+            [CHAIN_IDS.GOERLI]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x0': {
+                address: '0x0',
+              } as AddressBookEntry,
+            },
+          },
+          allTokens: {
+            [toHex(1)]: {
+              '0xabcde': [{ address: '0xtestAddress' } as Token],
+            },
+          },
+          ...networkState,
+          ledgerTransportType: LedgerTransportTypes.webhid,
+          openSeaEnabled: false,
+          internalAccounts: {
+            accounts: {
+              mock1: {} as InternalAccount,
+              mock2: {} as InternalAccount,
+              mock3: {} as InternalAccount,
+            },
+            selectedAccount: 'mock1',
+          },
+          useNftDetection: false,
+          theme: 'default',
+          useTokenDetection: true,
+          tokenSortConfig: {
+            key: 'token-sort-key',
+            order: 'dsc',
+            sortCallback: 'stringNumeric',
+          },
+          ShowNativeTokenAsMainBalance: false,
+          names: {
+            ethereumAddress: {},
+          },
+          security_providers: ['blockaid'],
+          currentCurrency: 'usd',
+          allNfts: {},
+          participateInMetaMetrics: true,
+          dataCollectionForMarketing: false,
+          securityAlertsEnabled: true,
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          custodyAccountDetails: {},
+          ///: END:ONLY_INCLUDE_IF
+        });
+
+        expect(updatedTraits).toStrictEqual({
+          [MetaMetricsUserTrait.AddressBookEntries]: 4,
+          [MetaMetricsUserTrait.NumberOfAccounts]: 3,
+          [MetaMetricsUserTrait.NumberOfTokens]: 1,
+          [MetaMetricsUserTrait.OpenSeaApiEnabled]: false,
+          [MetaMetricsUserTrait.ShowNativeTokenAsMainBalance]: false,
+        });
+      });
+    });
+
+    it('should return null if no traits changed', async function () {
+      await withController(({ controller }) => {
+        const networkState = mockNetworkState(
+          { chainId: CHAIN_IDS.MAINNET },
+          { chainId: CHAIN_IDS.GOERLI },
+        );
+        controller._buildUserTraitsObject({
+          addressBook: {
+            [CHAIN_IDS.MAINNET]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+            },
+            [CHAIN_IDS.GOERLI]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x0': {
+                address: '0x0',
+              } as AddressBookEntry,
+            },
+          },
+          allTokens: {},
+          ...networkState,
+          ledgerTransportType: LedgerTransportTypes.webhid,
+          openSeaEnabled: true,
+          internalAccounts: {
+            accounts: {
+              mock1: {} as InternalAccount,
+              mock2: {} as InternalAccount,
+            },
+            selectedAccount: 'mock1',
+          },
+          useNftDetection: true,
+          theme: 'default',
+          useTokenDetection: true,
+          tokenSortConfig: {
+            key: 'token-sort-key',
+            order: 'dsc',
+            sortCallback: 'stringNumeric',
+          },
+          ShowNativeTokenAsMainBalance: true,
+          allNfts: {},
+          names: {
+            ethereumAddress: {},
+          },
+          participateInMetaMetrics: true,
+          dataCollectionForMarketing: false,
+          securityAlertsEnabled: true,
+          security_providers: ['blockaid'],
+          currentCurrency: 'usd',
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          custodyAccountDetails: {},
+          ///: END:ONLY_INCLUDE_IF
+        });
+
+        const updatedTraits = controller._buildUserTraitsObject({
+          addressBook: {
+            [CHAIN_IDS.MAINNET]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+            },
+            [CHAIN_IDS.GOERLI]: {
+              '0x': {
+                address: '0x',
+              } as AddressBookEntry,
+              '0x0': { address: '0x0' } as AddressBookEntry,
+            },
+          },
+          allTokens: {},
+          ...networkState,
+          ledgerTransportType: LedgerTransportTypes.webhid,
+          openSeaEnabled: true,
+          internalAccounts: {
+            accounts: {
+              mock1: {} as InternalAccount,
+              mock2: {} as InternalAccount,
+            },
+            selectedAccount: 'mock1',
+          },
+          useNftDetection: true,
+          theme: 'default',
+          useTokenDetection: true,
+          tokenSortConfig: {
+            key: 'token-sort-key',
+            order: 'dsc',
+            sortCallback: 'stringNumeric',
+          },
+          ShowNativeTokenAsMainBalance: true,
+          allNfts: {},
+          participateInMetaMetrics: true,
+          dataCollectionForMarketing: false,
+          names: {
+            ethereumAddress: {},
+          },
+          securityAlertsEnabled: true,
+          security_providers: ['blockaid'],
+          currentCurrency: 'usd',
+          ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+          custodyAccountDetails: {},
+          ///: END:ONLY_INCLUDE_IF
+        });
+        expect(updatedTraits).toStrictEqual(null);
+      });
+    });
+  });
+
+  describe('submitting segmentApiCalls to segment SDK', function () {
+    it('should add event to store when submitting to SDK', async function () {
+      await withController(({ controller }) => {
+        controller.trackPage({}, { isOptInPath: true });
+        const { segmentApiCalls } = controller.state;
+        expect(Object.keys(segmentApiCalls).length > 0).toStrictEqual(true);
+      });
+    });
+
+    it('should remove event from store when callback is invoked', async function () {
+      const segmentInstance = createSegmentMock(2);
+      const stubFn = (...args: unknown[]) => {
+        const cb = args[1] as () => void;
+        cb();
+      };
+      jest.spyOn(segmentInstance, 'track').mockImplementation(stubFn);
+      jest.spyOn(segmentInstance, 'page').mockImplementation(stubFn);
+
+      await withController(
+        {
+          options: {
+            segment: segmentInstance,
+          },
+        },
+        ({ controller }) => {
+          controller.trackPage({}, { isOptInPath: true });
+          const { segmentApiCalls } = controller.state;
+          expect(Object.keys(segmentApiCalls).length === 0).toStrictEqual(true);
+        },
+      );
+    });
+  });
+  describe('setMarketingCampaignCookieId', function () {
+    it('should update marketingCampaignCookieId in the context when cookieId is available', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              participateInMetaMetrics: true,
+              metaMetricsId: TEST_META_METRICS_ID,
+              dataCollectionForMarketing: true,
+            },
+          },
+        },
+        ({ controller }) => {
+          controller.setMarketingCampaignCookieId(TEST_GA_COOKIE_ID);
+          expect(controller.state.marketingCampaignCookieId).toStrictEqual(
+            TEST_GA_COOKIE_ID,
+          );
+          const spy = jest.spyOn(segmentMock, 'track');
+          controller.trackEvent(
+            {
+              event: 'Fake Event',
+              category: 'Unit Test',
+              properties: {
+                chain_id: '1',
+              },
+            },
+            { isOptIn: true },
+          );
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy).toHaveBeenCalledWith(
+            {
+              event: 'Fake Event',
+              anonymousId: METAMETRICS_ANONYMOUS_ID,
+              context: {
+                ...DEFAULT_TEST_CONTEXT,
+                marketingCampaignCookieId: TEST_GA_COOKIE_ID,
+              },
+              properties: {
+                ...DEFAULT_EVENT_PROPERTIES,
+                chain_id: '1',
+              },
+              messageId: Utils.generateRandomId(),
+              timestamp: new Date(),
+            },
+            spy.mock.calls[0][1],
+          );
+        },
+      );
+    });
+  });
+  describe('setDataCollectionForMarketing', function () {
+    it('should nullify the marketingCampaignCookieId when Data collection for marketing is toggled off', async function () {
+      await withController(
+        {
+          options: {
+            state: {
+              metaMetricsId: TEST_META_METRICS_ID,
+              dataCollectionForMarketing: true,
+              marketingCampaignCookieId: TEST_GA_COOKIE_ID,
+            },
+          },
+        },
+        async ({ controller }) => {
+          expect(controller.state.marketingCampaignCookieId).toStrictEqual(
+            TEST_GA_COOKIE_ID,
+          );
+          await controller.setDataCollectionForMarketing(false);
+          expect(controller.state.marketingCampaignCookieId).toStrictEqual(
+            null,
+          );
+        },
+      );
+    });
+  });
+});
+
+type WithControllerOptions = {
+  currentLocale?: string;
+  options?: Partial<MetaMetricsControllerOptions>;
+  mockNetworkClientConfigurationsByNetworkClientId?: Record<
+    NetworkClientId,
+    {
+      chainId: string;
+    }
+  >;
+};
+
+type WithControllerCallback<ReturnValue> = ({
+  controller,
+  triggerPreferencesControllerStateChange,
+  triggerNetworkDidChange,
+}: {
+  controller: MetaMetricsController;
+  triggerPreferencesControllerStateChange: (
+    state: PreferencesControllerState,
+  ) => void;
+  triggerNetworkDidChange(state: NetworkState): void;
+}) => ReturnValue;
+
+type WithControllerArgs<ReturnValue> =
+  | [WithControllerCallback<ReturnValue>]
+  | [WithControllerOptions, WithControllerCallback<ReturnValue>];
+
+async function withController<ReturnValue>(
+  ...args: WithControllerArgs<ReturnValue>
+): Promise<ReturnValue> {
+  try {
+    globalThis.sentry = {};
+    jest.useFakeTimers().setSystemTime(new Date().getTime());
+    jest.spyOn(Utils, 'generateRandomId').mockReturnValue('DUMMY_RANDOM_ID');
+
+    const [{ ...rest }, fn] = args.length === 2 ? args : [{}, args[0]];
+    const {
+      options = {},
+      currentLocale = LOCALE,
+      mockNetworkClientConfigurationsByNetworkClientId = {
+        selectedNetworkClientId: {
+          chainId: DEFAULT_CHAIN_ID,
+        },
+      },
+    } = rest;
+    const controllerMessenger = new ControllerMessenger<
+      AllowedActions,
+      AllowedEvents
+    >();
+
+    controllerMessenger.registerActionHandler(
+      'PreferencesController:getState',
+      jest.fn().mockReturnValue({
+        currentLocale,
+      }),
+    );
+
+    controllerMessenger.registerActionHandler(
+      'NetworkController:getState',
+      jest.fn().mockReturnValue({
+        selectedNetworkClientId: Object.keys(
+          mockNetworkClientConfigurationsByNetworkClientId,
+        )[0],
+      }),
+    );
+
+    controllerMessenger.registerActionHandler(
+      'NetworkController:getNetworkClientById',
+      jest.fn().mockReturnValue({
+        configuration: Object.values(
+          mockNetworkClientConfigurationsByNetworkClientId,
+        )[0],
+      }),
+    );
+
+    return fn({
+      controller: new MetaMetricsController({
+        segment: segmentMock,
+        messenger: controllerMessenger.getRestricted({
+          name: 'MetaMetricsController',
+          allowedActions: [
+            'PreferencesController:getState',
+            'NetworkController:getState',
+            'NetworkController:getNetworkClientById',
+          ],
+          allowedEvents: [
+            'PreferencesController:stateChange',
+            'NetworkController:networkDidChange',
+          ],
+        }),
+        version: '0.0.1',
+        environment: 'test',
+        extension: MOCK_EXTENSION,
+        ...options,
+        state: {
+          participateInMetaMetrics: true,
+          metaMetricsId: TEST_META_METRICS_ID,
+          marketingCampaignCookieId: null,
+          fragments: {
+            testid: SAMPLE_PERSISTED_EVENT,
+            testid2: SAMPLE_NON_PERSISTED_EVENT,
+          },
+          ...options.state,
+        },
+      }),
+      triggerPreferencesControllerStateChange: (state) =>
+        controllerMessenger.publish(
+          'PreferencesController:stateChange',
+          state,
+          [],
+        ),
+      triggerNetworkDidChange: (state) =>
+        controllerMessenger.publish(
+          'NetworkController:networkDidChange',
+          state,
+        ),
+    });
+  } finally {
+    // flush the queues manually after each test
+    segmentMock.flush();
+    jest.useRealTimers();
+    jest.restoreAllMocks();
+  }
+}
diff --git a/app/scripts/controllers/metametrics.ts b/app/scripts/controllers/metametrics-controller.ts
similarity index 83%
rename from app/scripts/controllers/metametrics.ts
rename to app/scripts/controllers/metametrics-controller.ts
index ded99dd917f4..25ae949ea6c3 100644
--- a/app/scripts/controllers/metametrics.ts
+++ b/app/scripts/controllers/metametrics-controller.ts
@@ -8,7 +8,6 @@ import {
   size,
   sum,
 } from 'lodash';
-import { ObservableStore } from '@metamask/obs-store';
 import { bufferToHex, keccak } from 'ethereumjs-util';
 import { v4 as uuidv4 } from 'uuid';
 import { NameControllerState, NameType } from '@metamask/name-controller';
@@ -19,7 +18,13 @@ import {
   isErrorWithMessage,
   isErrorWithStack,
 } from '@metamask/utils';
-import { NetworkState } from '@metamask/network-controller';
+import {
+  NetworkClientId,
+  NetworkControllerGetNetworkClientByIdAction,
+  NetworkControllerGetStateAction,
+  NetworkControllerNetworkDidChangeEvent,
+  NetworkState,
+} from '@metamask/network-controller';
 import { Browser } from 'webextension-polyfill';
 import {
   Nft,
@@ -27,6 +32,12 @@ import {
   TokensControllerState,
 } from '@metamask/assets-controllers';
 import { captureException as sentryCaptureException } from '@sentry/browser';
+import {
+  BaseController,
+  ControllerGetStateAction,
+  ControllerStateChangeEvent,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
 import { AddressBookControllerState } from '@metamask/address-book-controller';
 import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
 import {
@@ -61,7 +72,14 @@ import Analytics from '../lib/segment/analytics';
 import { ENVIRONMENT } from '../../../development/build/constants';
 ///: END:ONLY_INCLUDE_IF
 
-import type { PreferencesControllerState } from './preferences-controller';
+import type {
+  PreferencesControllerState,
+  PreferencesControllerGetStateAction,
+  PreferencesControllerStateChangeEvent,
+} from './preferences-controller';
+
+// Unique name for the controller
+const controllerName = 'MetaMetricsController';
 
 const EXTENSION_UNINSTALL_URL = 'https://metamask.io/uninstalled';
 
@@ -155,6 +173,56 @@ export type MetaMaskState = {
   ///: END:ONLY_INCLUDE_IF
 };
 
+/**
+ * {@link MetaMetricsController}'s metadata.
+ *
+ * This allows us to choose if fields of the state should be persisted or not
+ * using the `persist` flag; and if they can be sent to Sentry or not, using
+ * the `anonymous` flag.
+ */
+const controllerMetadata = {
+  metaMetricsId: {
+    persist: true,
+    anonymous: true,
+  },
+  participateInMetaMetrics: {
+    persist: true,
+    anonymous: true,
+  },
+  latestNonAnonymousEventTimestamp: {
+    persist: true,
+    anonymous: true,
+  },
+  fragments: {
+    persist: true,
+    anonymous: false,
+  },
+  eventsBeforeMetricsOptIn: {
+    persist: true,
+    anonymous: false,
+  },
+  traits: {
+    persist: true,
+    anonymous: false,
+  },
+  previousUserTraits: {
+    persist: true,
+    anonymous: false,
+  },
+  dataCollectionForMarketing: {
+    persist: true,
+    anonymous: false,
+  },
+  marketingCampaignCookieId: {
+    persist: true,
+    anonymous: true,
+  },
+  segmentApiCalls: {
+    persist: true,
+    anonymous: false,
+  },
+};
+
 /**
  * The state that MetaMetricsController stores.
  *
@@ -189,28 +257,91 @@ export type MetaMetricsControllerState = {
   >;
 };
 
+/**
+ * Returns the state of the {@link MetaMetricsController}.
+ */
+export type MetaMetricsControllerGetStateAction = ControllerGetStateAction<
+  typeof controllerName,
+  MetaMetricsControllerState
+>;
+
+/**
+ * Actions exposed by the {@link MetaMetricsController}.
+ */
+export type MetaMetricsControllerActions = MetaMetricsControllerGetStateAction;
+
+/**
+ * Event emitted when the state of the {@link MetaMetricsController} changes.
+ */
+export type MetaMetricsControllerStateChangeEvent = ControllerStateChangeEvent<
+  typeof controllerName,
+  MetaMetricsControllerState
+>;
+
+export type MetaMetricsControllerEvents = MetaMetricsControllerStateChangeEvent;
+
+/**
+ * Actions that this controller is allowed to call.
+ */
+export type AllowedActions =
+  | PreferencesControllerGetStateAction
+  | NetworkControllerGetStateAction
+  | NetworkControllerGetNetworkClientByIdAction;
+
+/**
+ * Events that this controller is allowed to subscribe.
+ */
+export type AllowedEvents =
+  | PreferencesControllerStateChangeEvent
+  | NetworkControllerNetworkDidChangeEvent;
+
+/**
+ * Messenger type for the {@link MetaMetricsController}.
+ */
+export type MetaMetricsControllerMessenger = RestrictedControllerMessenger<
+  typeof controllerName,
+  MetaMetricsControllerActions | AllowedActions,
+  MetaMetricsControllerEvents | AllowedEvents,
+  AllowedActions['type'],
+  AllowedEvents['type']
+>;
+
 type CaptureException =
   | typeof sentryCaptureException
   | ((err: unknown) => void);
 
 export type MetaMetricsControllerOptions = {
-  initState: Partial<MetaMetricsControllerState>;
+  state?: Partial<MetaMetricsControllerState>;
+  messenger: MetaMetricsControllerMessenger;
   segment: Analytics;
-  preferencesControllerState: PreferencesControllerState;
-  onPreferencesStateChange: (
-    listener: (state: PreferencesControllerState) => void,
-  ) => void;
-  onNetworkDidChange: (listener: (networkState: NetworkState) => void) => void;
-  getCurrentChainId: () => Hex;
   version: string;
   environment: string;
   extension: Browser;
   captureException?: CaptureException;
 };
 
-export default class MetaMetricsController {
-  store: ObservableStore<MetaMetricsControllerState>;
+/**
+ * Function to get default state of the {@link MetaMetricsController}.
+ */
+export const getDefaultMetaMetricsControllerState =
+  (): MetaMetricsControllerState => ({
+    participateInMetaMetrics: null,
+    metaMetricsId: null,
+    dataCollectionForMarketing: null,
+    marketingCampaignCookieId: null,
+    latestNonAnonymousEventTimestamp: 0,
+    eventsBeforeMetricsOptIn: [],
+    traits: {},
+    previousUserTraits: {},
+    fragments: {},
+    segmentApiCalls: {},
+  });
 
+export default class MetaMetricsController extends BaseController<
+  typeof controllerName,
+  MetaMetricsControllerState,
+  MetaMetricsControllerMessenger
+> {
   #captureException: CaptureException;
 
   chainId: Hex;
@@ -231,32 +362,34 @@ export default class MetaMetricsController {
 
   /**
    * @param options
+   * @param options.state - Initial controller state.
+   * @param options.messenger - Messenger used to communicate with BaseV2 controller.
    * @param options.segment - an instance of analytics for tracking
    * events that conform to the new MetaMetrics tracking plan.
-   * @param options.preferencesControllerState - The state of preferences controller
-   * @param options.onPreferencesStateChange - Used to attach a listener to the
-   * stateChange event emitted by the PreferencesController
-   * @param options.onNetworkDidChange - Used to attach a listener to the
-   * networkDidChange event emitted by the networkController
-   * @param options.getCurrentChainId - Gets the current chain id from the network controller.
    * @param options.version - The version of the extension
    * @param options.environment - The environment the extension is running in
    * @param options.extension - webextension-polyfill
-   * @param options.initState - State to initialized with
    * @param options.captureException
    */
   constructor({
+    state = {},
+    messenger,
     segment,
-    preferencesControllerState,
-    onPreferencesStateChange,
-    onNetworkDidChange,
-    getCurrentChainId,
     version,
     environment,
-    initState,
     extension,
     captureException = defaultCaptureException,
   }: MetaMetricsControllerOptions) {
+    super({
+      name: controllerName,
+      metadata: controllerMetadata,
+      state: {
+        ...getDefaultMetaMetricsControllerState(),
+        ...state,
+      },
+      messenger,
+    });
+
     this.#captureException = (err: unknown) => {
       const message = getErrorMessage(err);
       // This is a temporary measure. Currently there are errors flooding sentry due to a problem in how we are tracking anonymousId
@@ -265,7 +398,10 @@ export default class MetaMetricsController {
         captureException(err);
       }
     };
-    this.chainId = getCurrentChainId();
+    this.chainId = this.#getCurrentChainId();
+    const preferencesControllerState = this.messagingSystem.call(
+      'PreferencesController:getState',
+    );
     this.locale = preferencesControllerState.currentLocale.replace('_', '-');
     this.version =
       environment === 'production' ? version : `${version}-${environment}`;
@@ -276,34 +412,21 @@ export default class MetaMetricsController {
     this.#selectedAddress = preferencesControllerState.selectedAddress;
     ///: END:ONLY_INCLUDE_IF
 
-    const abandonedFragments = omitBy(initState?.fragments, 'persist');
-    const segmentApiCalls = initState?.segmentApiCalls || {};
-
-    this.store = new ObservableStore({
-      participateInMetaMetrics: null,
-      metaMetricsId: null,
-      dataCollectionForMarketing: null,
-      marketingCampaignCookieId: null,
-      latestNonAnonymousEventTimestamp: 0,
-      eventsBeforeMetricsOptIn: [],
-      traits: {},
-      previousUserTraits: {},
-      ...initState,
-      fragments: {
-        ...initState?.fragments,
-      },
-      segmentApiCalls: {
-        ...segmentApiCalls,
-      },
-    });
+    const abandonedFragments = omitBy(state.fragments, 'persist');
 
-    onPreferencesStateChange(({ currentLocale }) => {
-      this.locale = currentLocale?.replace('_', '-');
-    });
+    this.messagingSystem.subscribe(
+      'PreferencesController:stateChange',
+      ({ currentLocale }) => {
+        this.locale = currentLocale?.replace('_', '-');
+      },
+    );
 
-    onNetworkDidChange(() => {
-      this.chainId = getCurrentChainId();
-    });
+    this.messagingSystem.subscribe(
+      'NetworkController:networkDidChange',
+      ({ selectedNetworkClientId }) => {
+        this.chainId = this.#getCurrentChainId(selectedNetworkClientId);
+      },
+    );
     this.#segment = segment;
 
     // Track abandoned fragments that weren't properly cleaned up.
@@ -318,13 +441,15 @@ export default class MetaMetricsController {
 
     // Code below submits any pending segmentApiCalls to Segment if/when the controller is re-instantiated
     if (isManifestV3) {
-      Object.values(segmentApiCalls).forEach(({ eventType, payload }) => {
-        try {
-          this.#submitSegmentAPICall(eventType, payload);
-        } catch (error) {
-          this.#captureException(error);
-        }
-      });
+      Object.values(state.segmentApiCalls || {}).forEach(
+        ({ eventType, payload }) => {
+          try {
+            this.#submitSegmentAPICall(eventType, payload);
+          } catch (error) {
+            this.#captureException(error);
+          }
+        },
+      );
     }
 
     // Close out event fragments that were created but not progressed. An
@@ -362,8 +487,27 @@ export default class MetaMetricsController {
     }
   }
 
+  /**
+   * Gets the current chain ID.
+   *
+   * @param networkClientId - The network client ID to get the chain ID for.
+   */
+  #getCurrentChainId(networkClientId?: NetworkClientId): Hex {
+    const selectedNetworkClientId =
+      networkClientId ||
+      this.messagingSystem.call('NetworkController:getState')
+        .selectedNetworkClientId;
+    const {
+      configuration: { chainId },
+    } = this.messagingSystem.call(
+      'NetworkController:getNetworkClientById',
+      selectedNetworkClientId,
+    );
+    return chainId;
+  }
+
   finalizeAbandonedFragments(): void {
-    Object.values(this.store.getState().fragments).forEach((fragment) => {
+    Object.values(this.state.fragments).forEach((fragment) => {
       if (
         fragment.timeout &&
         fragment.lastUpdated &&
@@ -407,7 +551,7 @@ export default class MetaMetricsController {
       );
     }
 
-    const { fragments } = this.store.getState();
+    const { fragments } = this.state;
 
     const id = options.uniqueIdentifier ?? uuidv4();
     const fragment = {
@@ -435,11 +579,9 @@ export default class MetaMetricsController {
         }
       : {};
 
-    this.store.updateState({
-      fragments: {
-        ...fragments,
-        [id]: merge(additionalFragmentProps, fragment),
-      },
+    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);
     });
 
     if (fragment.initialEvent) {
@@ -469,11 +611,7 @@ export default class MetaMetricsController {
    * @param id - id of fragment to retrieve
    */
   getEventFragmentById(id: string): MetaMetricsEventFragment {
-    const { fragments } = this.store.getState();
-
-    const fragment = fragments[id];
-
-    return fragment;
+    return this.state.fragments[id];
   }
 
   /**
@@ -499,7 +637,7 @@ export default class MetaMetricsController {
     id: string,
     payload: Partial<MetaMetricsEventFragment>,
   ): void {
-    const { fragments } = this.store.getState();
+    const { fragments } = this.state;
 
     const fragment = fragments[id];
 
@@ -512,24 +650,26 @@ export default class MetaMetricsController {
     const createIfNotFound = !fragment && id.includes('transaction-submitted-');
 
     if (createIfNotFound) {
-      fragments[id] = {
-        canDeleteIfAbandoned: true,
-        category: MetaMetricsEventCategory.Transactions,
-        successEvent: TransactionMetaMetricsEvent.finalized,
-        id,
-      };
+      this.update((state) => {
+        state.fragments[id] = {
+          canDeleteIfAbandoned: true,
+          category: MetaMetricsEventCategory.Transactions,
+          successEvent: TransactionMetaMetricsEvent.finalized,
+          id,
+          ...payload,
+          lastUpdated: Date.now(),
+        };
+      });
+      return;
     } else if (!fragment) {
       throw new Error(`Event fragment with id ${id} does not exist.`);
     }
 
-    this.store.updateState({
-      fragments: {
-        ...fragments,
-        [id]: merge(fragments[id], {
-          ...payload,
-          lastUpdated: Date.now(),
-        }),
-      },
+    this.update((state) => {
+      state.fragments[id] = merge(state.fragments[id], {
+        ...payload,
+        lastUpdated: Date.now(),
+      });
     });
   }
 
@@ -539,10 +679,10 @@ export default class MetaMetricsController {
    * @param id - The fragment id to delete
    */
   deleteEventFragment(id: string): void {
-    const { fragments } = this.store.getState();
-
-    if (fragments[id]) {
-      delete fragments[id];
+    if (this.state.fragments[id]) {
+      this.update((state) => {
+        delete state.fragments[id];
+      });
     }
   }
 
@@ -569,7 +709,7 @@ export default class MetaMetricsController {
       referrer?: MetaMetricsReferrerObject;
     } = {},
   ): void {
-    const fragment = this.store.getState().fragments[id];
+    const fragment = this.state.fragments[id];
     if (!fragment) {
       throw new Error(`Funnel with id ${id} does not exist.`);
     }
@@ -597,9 +737,9 @@ export default class MetaMetricsController {
         ? `${fragment.uniqueIdentifier}-${abandoned ? 'failure' : 'success'}`
         : undefined,
     });
-    const { fragments } = this.store.getState();
-    delete fragments[id];
-    this.store.updateState({ fragments });
+    this.update((state) => {
+      delete state.fragments[id];
+    });
   }
 
   /**
@@ -669,7 +809,10 @@ export default class MetaMetricsController {
         ? this.generateMetaMetricsId()
         : existingMetaMetricsId;
 
-    this.store.updateState({ participateInMetaMetrics, metaMetricsId });
+    this.update((state) => {
+      state.participateInMetaMetrics = participateInMetaMetrics;
+      state.metaMetricsId = metaMetricsId;
+    });
 
     if (participateInMetaMetrics) {
       this.trackEventsAfterMetricsOptIn();
@@ -695,7 +838,9 @@ export default class MetaMetricsController {
   ): MetaMetricsControllerState['metaMetricsId'] {
     const { metaMetricsId } = this.state;
 
-    this.store.updateState({ dataCollectionForMarketing });
+    this.update((state) => {
+      state.dataCollectionForMarketing = dataCollectionForMarketing;
+    });
 
     if (!dataCollectionForMarketing && this.state.marketingCampaignCookieId) {
       this.setMarketingCampaignCookieId(null);
@@ -705,11 +850,9 @@ export default class MetaMetricsController {
   }
 
   setMarketingCampaignCookieId(marketingCampaignCookieId: string | null): void {
-    this.store.updateState({ marketingCampaignCookieId });
-  }
-
-  get state(): MetaMetricsControllerState {
-    return this.store.getState();
+    this.update((state) => {
+      state.marketingCampaignCookieId = marketingCampaignCookieId;
+    });
   }
 
   /**
@@ -767,10 +910,10 @@ export default class MetaMetricsController {
     options?: MetaMetricsEventOptions,
   ): void {
     // validation is not caught and handled
-    this.validatePayload(payload);
-    this.submitEvent(payload, options).catch((err) =>
-      this.#captureException(err),
-    );
+    this.#validatePayload(payload);
+    this.#submitEvent(payload, options).catch((err) => {
+      this.#captureException(err);
+    });
   }
 
   /**
@@ -782,12 +925,10 @@ export default class MetaMetricsController {
    * @param payload - details of the event
    * @param options - options for handling/routing the event
    */
-  async submitEvent(
+  async #submitEvent(
     payload: MetaMetricsEventPayload,
     options?: MetaMetricsEventOptions,
   ): Promise<void> {
-    this.validatePayload(payload);
-
     if (!this.state.participateInMetaMetrics && !options?.isOptIn) {
       return;
     }
@@ -816,8 +957,8 @@ export default class MetaMetricsController {
       };
 
       const combinedProperties = merge(
-        anonymousPayload.sensitiveProperties,
-        anonymousPayload.properties,
+        { ...anonymousPayload.sensitiveProperties },
+        { ...anonymousPayload.properties },
       );
 
       events.push(
@@ -842,7 +983,7 @@ export default class MetaMetricsController {
    *
    * @param payload - details of the event
    */
-  validatePayload(payload: MetaMetricsEventPayload): void {
+  #validatePayload(payload: MetaMetricsEventPayload): void {
     // event and category are required fields for all payloads
     if (!payload.event || !payload.category) {
       throw new Error(
@@ -868,7 +1009,7 @@ export default class MetaMetricsController {
 
   // Track all queued events after a user opted into metrics.
   trackEventsAfterMetricsOptIn(): void {
-    const { eventsBeforeMetricsOptIn } = this.store.getState();
+    const { eventsBeforeMetricsOptIn } = this.state;
     eventsBeforeMetricsOptIn.forEach((eventBeforeMetricsOptIn) => {
       this.trackEvent(eventBeforeMetricsOptIn);
     });
@@ -876,24 +1017,22 @@ export default class MetaMetricsController {
 
   // Once we track queued events after a user opts into metrics, we want to clear the event queue.
   clearEventsAfterMetricsOptIn(): void {
-    this.store.updateState({
-      eventsBeforeMetricsOptIn: [],
+    this.update((state) => {
+      state.eventsBeforeMetricsOptIn = [];
     });
   }
 
   // It adds an event into a queue, which is only tracked if a user opts into metrics.
   addEventBeforeMetricsOptIn(event: MetaMetricsEventPayload): void {
-    const prevState = this.store.getState().eventsBeforeMetricsOptIn;
-    this.store.updateState({
-      eventsBeforeMetricsOptIn: [...prevState, event],
+    this.update((state) => {
+      state.eventsBeforeMetricsOptIn.push(event);
     });
   }
 
   // Add or update traits for tracking.
   updateTraits(newTraits: MetaMetricsUserTraits): void {
-    const { traits } = this.store.getState();
-    this.store.updateState({
-      traits: { ...traits, ...newTraits },
+    this.update((state) => {
+      state.traits = { ...state.traits, ...newTraits };
     });
   }
 
@@ -902,7 +1041,9 @@ export default class MetaMetricsController {
     let { metaMetricsId } = this.state;
     if (!metaMetricsId) {
       metaMetricsId = this.generateMetaMetricsId();
-      this.store.updateState({ metaMetricsId });
+      this.update((state) => {
+        state.metaMetricsId = metaMetricsId;
+      });
     }
     return metaMetricsId;
   }
@@ -1033,13 +1174,11 @@ export default class MetaMetricsController {
         ? Object.keys(metamaskState.custodyAccountDetails)[0]
         : null;
     ///: END:ONLY_INCLUDE_IF
-    const { traits, previousUserTraits } = this.store.getState();
+    const { traits, previousUserTraits } = this.state;
 
     const currentTraits = {
       [MetaMetricsUserTrait.AddressBookEntries]: sum(
-        Object.values(metamaskState.addressBook).map((v) =>
-          size(v as object | string | null | undefined),
-        ),
+        Object.values(metamaskState.addressBook).map(size),
       ),
       [MetaMetricsUserTrait.InstallDateExt]:
         traits[MetaMetricsUserTrait.InstallDateExt] || '',
@@ -1092,8 +1231,8 @@ export default class MetaMetricsController {
     };
 
     if (!previousUserTraits) {
-      this.store.updateState({
-        previousUserTraits: currentTraits,
+      this.update((state) => {
+        state.previousUserTraits = currentTraits;
       });
       return currentTraits;
     }
@@ -1104,7 +1243,9 @@ export default class MetaMetricsController {
         const previous = previousUserTraits[k];
         return !isEqual(previous, v);
       });
-      this.store.updateState({ previousUserTraits: currentTraits });
+      this.update((state) => {
+        state.previousUserTraits = currentTraits;
+      });
       return updates;
     }
 
@@ -1369,30 +1510,24 @@ export default class MetaMetricsController {
       messageId,
       timestamp,
     };
-    this.store.updateState({
-      ...this.store.getState(),
-      latestNonAnonymousEventTimestamp:
+    this.update((state) => {
+      state.latestNonAnonymousEventTimestamp =
         modifiedPayload.anonymousId === METAMETRICS_ANONYMOUS_ID
           ? latestNonAnonymousEventTimestamp
-          : timestamp.valueOf(),
-      // @ts-expect-error The reason this is needed is that the event property in the payload can be missing,
-      // whereas the state expects it to be present. It's unclear how best to handle this discrepancy.
-      segmentApiCalls: {
-        ...this.store.getState().segmentApiCalls,
-        [messageId]: {
-          eventType,
-          payload: {
-            ...modifiedPayload,
-            timestamp: modifiedPayload.timestamp.toString(),
-          },
+          : timestamp.valueOf();
+      state.segmentApiCalls[messageId] = {
+        eventType,
+        // @ts-expect-error The reason this is needed is that the event property in the payload can be missing,
+        // whereas the state expects it to be present. It's unclear how best to handle this discrepancy.
+        payload: {
+          ...modifiedPayload,
+          timestamp: modifiedPayload.timestamp.toString(),
         },
-      },
+      };
     });
     const modifiedCallback = (result: unknown) => {
-      const { segmentApiCalls } = this.store.getState();
-      delete segmentApiCalls[messageId];
-      this.store.updateState({
-        segmentApiCalls,
+      this.update((state) => {
+        delete state.segmentApiCalls[messageId];
       });
       return callback?.(result);
     };
diff --git a/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.test.ts b/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.test.ts
index be22cbdf77c0..9d5dc3259ed4 100644
--- a/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.test.ts
+++ b/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.test.ts
@@ -1,5 +1,6 @@
 import { ControllerMessenger } from '@metamask/base-controller';
 import {
+  AllowedActions,
   MetaMetricsDataDeletionController,
   type MetaMetricsDataDeletionControllerMessengerActions,
 } from './metametrics-data-deletion';
@@ -10,8 +11,8 @@ describe('MetaMetricsDataDeletionController', () => {
       const mockMetaMetricsId = 'mockId';
       const mockTaskId = 'mockTaskId';
       const { controller, dataDeletionService } = setupController({
+        metaMetricsId: mockMetaMetricsId,
         options: {
-          getMetaMetricsId: jest.fn().mockReturnValue(mockMetaMetricsId),
           dataDeletionService: {
             createDataDeletionRegulationTask: jest
               .fn()
@@ -43,8 +44,8 @@ describe('MetaMetricsDataDeletionController', () => {
       const mockMetaMetricsId = 'mockId';
       const mockTaskId = 'mockTaskId';
       const { controller, dataDeletionService } = setupController({
+        metaMetricsId: mockMetaMetricsId,
         options: {
-          getMetaMetricsId: jest.fn().mockReturnValue(mockMetaMetricsId),
           dataDeletionService: {
             createDataDeletionRegulationTask: jest
               .fn()
@@ -76,9 +77,7 @@ describe('MetaMetricsDataDeletionController', () => {
 
     it('fails to creates a data deletion task when user has never participating in metrics tracking', async () => {
       const { controller } = setupController({
-        options: {
-          getMetaMetricsId: jest.fn().mockReturnValue(null),
-        },
+        metaMetricsId: null,
       });
       await expect(
         controller.createMetaMetricsDataDeletionTask(),
@@ -94,8 +93,8 @@ describe('MetaMetricsDataDeletionController', () => {
       const mockMetaMetricsId = 'mockId';
       const mockTaskId = 'mockTaskId';
       const { controller, dataDeletionService } = setupController({
+        metaMetricsId: mockMetaMetricsId,
         options: {
-          getMetaMetricsId: jest.fn().mockReturnValue(mockMetaMetricsId),
           dataDeletionService: {
             createDataDeletionRegulationTask: jest
               .fn()
@@ -128,28 +127,35 @@ describe('MetaMetricsDataDeletionController', () => {
  *
  * @param options - Setup options.
  * @param options.options - Controller constructor options.
+ * @param options.metaMetricsId - The MetaMetrics ID to use.
  * @returns The test controller, a messenger instance, and related mocks.
  */
 function setupController({
   options,
+  metaMetricsId,
 }: {
   options?: Partial<
     ConstructorParameters<typeof MetaMetricsDataDeletionController>[0]
   >;
+  metaMetricsId?: string | null;
 } = {}): {
   controller: MetaMetricsDataDeletionController;
   dataDeletionService: ConstructorParameters<
     typeof MetaMetricsDataDeletionController
   >[0]['dataDeletionService'];
   messenger: ControllerMessenger<
-    MetaMetricsDataDeletionControllerMessengerActions,
+    MetaMetricsDataDeletionControllerMessengerActions | AllowedActions,
     never
   >;
 } {
-  const messenger = new ControllerMessenger<
-    MetaMetricsDataDeletionControllerMessengerActions,
+  const controllerMessenger = new ControllerMessenger<
+    MetaMetricsDataDeletionControllerMessengerActions | AllowedActions,
     never
   >();
+  controllerMessenger.registerActionHandler(
+    'MetaMetricsController:getState',
+    jest.fn().mockReturnValue({ metaMetricsId }),
+  );
   const mockCreateDataDeletionRegulationTaskResponse = 'mockRegulateId';
   const mockFetchDeletionRegulationStatusResponse = 'UNKNOWN';
   const mockDataDeletionService = {
@@ -164,9 +170,9 @@ function setupController({
   const constructorOptions = {
     dataDeletionService: mockDataDeletionService,
     getMetaMetricsId: jest.fn().mockReturnValue('mockMetaMetricsId'),
-    messenger: messenger.getRestricted({
+    messenger: controllerMessenger.getRestricted({
       name: 'MetaMetricsDataDeletionController',
-      allowedActions: [],
+      allowedActions: ['MetaMetricsController:getState'],
       allowedEvents: [],
     }),
     ...options,
@@ -176,6 +182,6 @@ function setupController({
   return {
     controller,
     dataDeletionService: constructorOptions.dataDeletionService,
-    messenger,
+    messenger: controllerMessenger,
   };
 }
diff --git a/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.ts b/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.ts
index 8aad81c3721d..ec3c431ee38f 100644
--- a/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.ts
+++ b/app/scripts/controllers/metametrics-data-deletion/metametrics-data-deletion.ts
@@ -5,6 +5,7 @@ import {
 import { PublicInterface } from '@metamask/utils';
 import type { DataDeletionService } from '../../services/data-deletion-service';
 import { DeleteRegulationStatus } from '../../../../shared/constants/metametrics';
+import { MetaMetricsControllerGetStateAction } from '../metametrics-controller';
 
 // Unique name for the controller
 const controllerName = 'MetaMetricsDataDeletionController';
@@ -70,14 +71,24 @@ export type MetaMetricsDataDeletionControllerMessengerActions =
   | CreateMetaMetricsDataDeletionTaskAction
   | UpdateDataDeletionTaskStatusAction;
 
+/**
+ * Actions that this controller is allowed to call.
+ */
+export type AllowedActions = MetaMetricsControllerGetStateAction;
+
+/**
+ * Events that this controller is allowed to subscribe.
+ */
+export type AllowedEvents = never;
+
 // Type for the messenger of MetaMetricsDataDeletionController
 export type MetaMetricsDataDeletionControllerMessenger =
   RestrictedControllerMessenger<
     typeof controllerName,
-    MetaMetricsDataDeletionControllerMessengerActions,
-    never,
-    never,
-    never
+    MetaMetricsDataDeletionControllerMessengerActions | AllowedActions,
+    AllowedEvents,
+    AllowedActions['type'],
+    AllowedEvents['type']
   >;
 
 /**
@@ -91,8 +102,6 @@ export class MetaMetricsDataDeletionController extends BaseController<
 > {
   #dataDeletionService: PublicInterface<DataDeletionService>;
 
-  #getMetaMetricsId: () => string | null;
-
   /**
    * Creates a MetaMetricsDataDeletionController instance.
    *
@@ -100,18 +109,15 @@ export class MetaMetricsDataDeletionController extends BaseController<
    * @param args.dataDeletionService - The service used for deleting data.
    * @param args.messenger - Messenger used to communicate with BaseV2 controller.
    * @param args.state - Initial state to set on this controller.
-   * @param args.getMetaMetricsId - A function that returns the current MetaMetrics ID.
    */
   constructor({
     dataDeletionService,
     messenger,
     state,
-    getMetaMetricsId,
   }: {
     dataDeletionService: PublicInterface<DataDeletionService>;
     messenger: MetaMetricsDataDeletionControllerMessenger;
     state?: Partial<MetaMetricsDataDeletionState>;
-    getMetaMetricsId: () => string | null;
   }) {
     // Call the constructor of BaseControllerV2
     super({
@@ -120,7 +126,6 @@ export class MetaMetricsDataDeletionController extends BaseController<
       name: controllerName,
       state: { ...getDefaultState(), ...state },
     });
-    this.#getMetaMetricsId = getMetaMetricsId;
     this.#dataDeletionService = dataDeletionService;
     this.#registerMessageHandlers();
   }
@@ -146,7 +151,9 @@ export class MetaMetricsDataDeletionController extends BaseController<
    *
    */
   async createMetaMetricsDataDeletionTask(): Promise<void> {
-    const metaMetricsId = this.#getMetaMetricsId();
+    const { metaMetricsId } = this.messagingSystem.call(
+      'MetaMetricsController:getState',
+    );
     if (!metaMetricsId) {
       throw new Error('MetaMetrics ID not found');
     }
diff --git a/app/scripts/controllers/metametrics.test.ts b/app/scripts/controllers/metametrics.test.ts
deleted file mode 100644
index 4b2a1f09a562..000000000000
--- a/app/scripts/controllers/metametrics.test.ts
+++ /dev/null
@@ -1,1734 +0,0 @@
-import { toHex } from '@metamask/controller-utils';
-import { NetworkState } from '@metamask/network-controller';
-import { NameEntry, NameType } from '@metamask/name-controller';
-import { AddressBookEntry } from '@metamask/address-book-controller';
-import {
-  Nft,
-  Token,
-  TokensControllerState,
-} from '@metamask/assets-controllers';
-import { InternalAccount } from '@metamask/keyring-api';
-import { Browser } from 'webextension-polyfill';
-import { Hex } from '@metamask/utils';
-import { merge } from 'lodash';
-import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
-import { createSegmentMock } from '../lib/segment';
-import {
-  METAMETRICS_ANONYMOUS_ID,
-  METAMETRICS_BACKGROUND_PAGE_OBJECT,
-  MetaMetricsUserTrait,
-  MetaMetricsUserTraits,
-} from '../../../shared/constants/metametrics';
-import { CHAIN_IDS } from '../../../shared/constants/network';
-import { LedgerTransportTypes } from '../../../shared/constants/hardware-wallets';
-import * as Utils from '../lib/util';
-import { mockNetworkState } from '../../../test/stub/networks';
-import MetaMetricsController, {
-  MetaMetricsControllerOptions,
-  MetaMetricsControllerState,
-} from './metametrics';
-import {
-  getDefaultPreferencesControllerState,
-  PreferencesControllerState,
-} from './preferences-controller';
-
-const segmentMock = createSegmentMock(2);
-
-const VERSION = '0.0.1-test';
-const FAKE_CHAIN_ID = '0x1338';
-const LOCALE = 'en_US';
-const TEST_META_METRICS_ID = '0xabc';
-const TEST_GA_COOKIE_ID = '123456.123455';
-const DUMMY_ACTION_ID = 'DUMMY_ACTION_ID';
-const MOCK_EXTENSION_ID = 'testid';
-
-const MOCK_EXTENSION = {
-  runtime: {
-    id: MOCK_EXTENSION_ID,
-    setUninstallURL: () => undefined,
-  },
-} as unknown as Browser;
-
-const MOCK_TRAITS = {
-  test_boolean: true,
-  test_string: 'abc',
-  test_number: 123,
-  test_bool_array: [true, true, false],
-  test_string_array: ['test', 'test', 'test'],
-  test_boolean_array: [1, 2, 3],
-} as MetaMetricsUserTraits;
-
-const MOCK_INVALID_TRAITS = {
-  test_null: null,
-  test_array_multi_types: [true, 'a', 1],
-} as MetaMetricsUserTraits;
-
-const DEFAULT_TEST_CONTEXT = {
-  app: {
-    name: 'MetaMask Extension',
-    version: VERSION,
-    extensionId: MOCK_EXTENSION_ID,
-  },
-  page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-  referrer: undefined,
-  userAgent: window.navigator.userAgent,
-  marketingCampaignCookieId: null,
-};
-
-const DEFAULT_SHARED_PROPERTIES = {
-  chain_id: FAKE_CHAIN_ID,
-  locale: LOCALE.replace('_', '-'),
-  environment_type: 'background',
-};
-
-const DEFAULT_EVENT_PROPERTIES = {
-  category: 'Unit Test',
-  revenue: undefined,
-  value: undefined,
-  currency: undefined,
-  extensionId: MOCK_EXTENSION_ID,
-  ...DEFAULT_SHARED_PROPERTIES,
-};
-
-const DEFAULT_PAGE_PROPERTIES = {
-  ...DEFAULT_SHARED_PROPERTIES,
-};
-
-const SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT = {
-  id: 'transaction-submitted-0000',
-  canDeleteIfAbandoned: true,
-  category: 'Unit Test',
-  successEvent: 'Transaction Finalized',
-  persist: true,
-  properties: {
-    simulation_response: 'no_balance_change',
-    test_stored_prop: 1,
-  },
-};
-
-const SAMPLE_PERSISTED_EVENT_NO_ID = {
-  persist: true,
-  category: 'Unit Test',
-  successEvent: 'sample persisted event success',
-  failureEvent: 'sample persisted event failure',
-  properties: {
-    test: true,
-  },
-};
-
-const SAMPLE_PERSISTED_EVENT = {
-  id: 'testid',
-  ...SAMPLE_PERSISTED_EVENT_NO_ID,
-};
-
-const SAMPLE_NON_PERSISTED_EVENT = {
-  id: 'testid2',
-  persist: false,
-  category: 'Unit Test',
-  successEvent: 'sample non-persisted event success',
-  failureEvent: 'sample non-persisted event failure',
-  uniqueIdentifier: 'sample-non-persisted-event',
-  properties: {
-    test: true,
-  },
-};
-
-function getMetaMetricsController({
-  participateInMetaMetrics = true,
-  metaMetricsId = TEST_META_METRICS_ID,
-  marketingCampaignCookieId = null,
-  currentLocale = LOCALE,
-  onPreferencesStateChange = () => {
-    // do nothing
-  },
-  getCurrentChainId = () => FAKE_CHAIN_ID,
-  onNetworkDidChange = () => {
-    // do nothing
-  },
-  segment = segmentMock,
-}: {
-  currentLocale?: string;
-  participateInMetaMetrics?: MetaMetricsControllerState['participateInMetaMetrics'];
-  metaMetricsId?: MetaMetricsControllerState['metaMetricsId'];
-  dataCollectionForMarketing?: MetaMetricsControllerState['dataCollectionForMarketing'];
-  marketingCampaignCookieId?: MetaMetricsControllerState['marketingCampaignCookieId'];
-  onPreferencesStateChange?: MetaMetricsControllerOptions['onPreferencesStateChange'];
-  getCurrentChainId?: MetaMetricsControllerOptions['getCurrentChainId'];
-  onNetworkDidChange?: MetaMetricsControllerOptions['onNetworkDidChange'];
-  segment?: MetaMetricsControllerOptions['segment'];
-} = {}) {
-  return new MetaMetricsController({
-    segment,
-    getCurrentChainId,
-    onNetworkDidChange,
-    preferencesControllerState: {
-      ...getDefaultPreferencesControllerState(),
-      currentLocale,
-    },
-    onPreferencesStateChange,
-    version: '0.0.1',
-    environment: 'test',
-    initState: {
-      participateInMetaMetrics,
-      metaMetricsId,
-      marketingCampaignCookieId,
-      fragments: {
-        testid: SAMPLE_PERSISTED_EVENT,
-        testid2: SAMPLE_NON_PERSISTED_EVENT,
-      },
-    },
-    extension: MOCK_EXTENSION,
-  });
-}
-
-describe('MetaMetricsController', function () {
-  const now = new Date();
-  beforeEach(function () {
-    globalThis.sentry = {};
-    jest.useFakeTimers().setSystemTime(now.getTime());
-    jest.spyOn(Utils, 'generateRandomId').mockReturnValue('DUMMY_RANDOM_ID');
-  });
-
-  describe('constructor', function () {
-    it('should properly initialize', function () {
-      const spy = jest.spyOn(segmentMock, 'track');
-      const metaMetricsController = getMetaMetricsController();
-      expect(metaMetricsController.version).toStrictEqual(VERSION);
-      expect(metaMetricsController.chainId).toStrictEqual(FAKE_CHAIN_ID);
-      expect(
-        metaMetricsController.state.participateInMetaMetrics,
-      ).toStrictEqual(true);
-      expect(metaMetricsController.state.metaMetricsId).toStrictEqual(
-        TEST_META_METRICS_ID,
-      );
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(null);
-      expect(metaMetricsController.locale).toStrictEqual(
-        LOCALE.replace('_', '-'),
-      );
-      expect(metaMetricsController.state.fragments).toStrictEqual({
-        testid: SAMPLE_PERSISTED_EVENT,
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'sample non-persisted event failure',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            test: true,
-          },
-          messageId: 'sample-non-persisted-event-failure',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should update when network changes', function () {
-      let chainId: Hex = '0x111';
-      let networkDidChangeListener: (state: NetworkState) => void = () => {
-        // do nothing
-      };
-      const onNetworkDidChange: (
-        listener: (state: NetworkState) => void,
-      ) => void = (listener) => {
-        networkDidChangeListener = listener;
-      };
-      const metaMetricsController = getMetaMetricsController({
-        getCurrentChainId: () => chainId,
-        onNetworkDidChange,
-      });
-
-      chainId = '0x222';
-
-      networkDidChangeListener({} as NetworkState);
-
-      expect(metaMetricsController.chainId).toStrictEqual('0x222');
-    });
-
-    it('should update when preferences changes', function () {
-      let subscribeListener: (
-        state: PreferencesControllerState,
-      ) => void = () => {
-        // do nothing
-      };
-      const onPreferencesStateChange: MetaMetricsControllerOptions['onPreferencesStateChange'] =
-        (listener) => {
-          subscribeListener = listener;
-        };
-      const metaMetricsController = getMetaMetricsController({
-        currentLocale: LOCALE,
-        onPreferencesStateChange,
-      });
-
-      subscribeListener({
-        ...getDefaultPreferencesControllerState(),
-        currentLocale: 'en_UK',
-      });
-      expect(metaMetricsController.locale).toStrictEqual('en-UK');
-    });
-  });
-
-  describe('createEventFragment', function () {
-    it('should throw an error if the param is missing successEvent or category', async function () {
-      const metaMetricsController = getMetaMetricsController();
-
-      await expect(() => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error because we are testing the error case
-        metaMetricsController.createEventFragment({ event: 'test' });
-      }).toThrow(/Must specify success event and category\./u);
-
-      await expect(() => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error because we are testing the error case
-        metaMetricsController.createEventFragment({ category: 'test' });
-      }).toThrow(/Must specify success event and category\./u);
-    });
-
-    it('should update fragments state with new fragment', function () {
-      jest.useFakeTimers().setSystemTime(1730798301422);
-
-      const metaMetricsController = getMetaMetricsController();
-      const mockNewId = 'testid3';
-
-      metaMetricsController.createEventFragment({
-        ...SAMPLE_PERSISTED_EVENT_NO_ID,
-        uniqueIdentifier: mockNewId,
-      });
-
-      const resultFragment = metaMetricsController.state.fragments[mockNewId];
-
-      expect(resultFragment).toStrictEqual({
-        ...SAMPLE_PERSISTED_EVENT_NO_ID,
-        id: mockNewId,
-        uniqueIdentifier: mockNewId,
-        lastUpdated: 1730798301422,
-      });
-
-      jest.useRealTimers();
-    });
-
-    it('should track the initial event if provided', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-      });
-      const spy = jest.spyOn(segmentMock, 'track');
-      const mockInitialEventName = 'Test Initial Event';
-
-      metaMetricsController.createEventFragment({
-        ...SAMPLE_PERSISTED_EVENT_NO_ID,
-        initialEvent: mockInitialEventName,
-      });
-
-      expect(spy).toHaveBeenCalledTimes(1);
-    });
-
-    it('should not call track if no initialEvent was provided', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-      });
-      const spy = jest.spyOn(segmentMock, 'track');
-
-      metaMetricsController.createEventFragment({
-        ...SAMPLE_PERSISTED_EVENT_NO_ID,
-      });
-
-      expect(spy).toHaveBeenCalledTimes(0);
-    });
-
-    describe('when intialEvent is "Transaction Submitted" and a fragment exists before createEventFragment is called', function () {
-      it('should update existing fragment state with new fragment props', function () {
-        jest.useFakeTimers().setSystemTime(1730798302222);
-
-        const metaMetricsController = getMetaMetricsController();
-        const { id } = SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT;
-
-        metaMetricsController.updateEventFragment(
-          SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT.id,
-          {
-            ...SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
-          },
-        );
-        metaMetricsController.createEventFragment({
-          ...SAMPLE_PERSISTED_EVENT_NO_ID,
-          initialEvent: 'Transaction Submitted',
-          uniqueIdentifier: id,
-        });
-
-        const resultFragment = metaMetricsController.state.fragments[id];
-        const expectedFragment = merge(
-          SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
-          SAMPLE_PERSISTED_EVENT_NO_ID,
-          {
-            canDeleteIfAbandoned: false,
-            id,
-            initialEvent: 'Transaction Submitted',
-            uniqueIdentifier: id,
-            lastUpdated: 1730798302222,
-          },
-        );
-
-        expect(resultFragment).toStrictEqual(expectedFragment);
-
-        jest.useRealTimers();
-      });
-    });
-  });
-
-  describe('updateEventFragment', function () {
-    beforeEach(function () {
-      jest.useFakeTimers().setSystemTime(1730798303333);
-    });
-    afterEach(function () {
-      jest.useRealTimers();
-    });
-
-    it('updates fragment with additional provided props', async function () {
-      const metaMetricsController = getMetaMetricsController();
-      const MOCK_PROPS_TO_UPDATE = {
-        properties: {
-          test: 1,
-        },
-      };
-
-      metaMetricsController.updateEventFragment(
-        SAMPLE_PERSISTED_EVENT.id,
-        MOCK_PROPS_TO_UPDATE,
-      );
-
-      const resultFragment =
-        metaMetricsController.state.fragments[SAMPLE_PERSISTED_EVENT.id];
-      const expectedPartialFragment = {
-        ...SAMPLE_PERSISTED_EVENT,
-        ...MOCK_PROPS_TO_UPDATE,
-        lastUpdated: 1730798303333,
-      };
-      expect(resultFragment).toStrictEqual(expectedPartialFragment);
-    });
-
-    it('throws error when no existing fragment exists', async function () {
-      const metaMetricsController = getMetaMetricsController();
-
-      const MOCK_NONEXISTING_ID = 'test-nonexistingid';
-
-      await expect(() => {
-        metaMetricsController.updateEventFragment(MOCK_NONEXISTING_ID, {
-          properties: { test: 1 },
-        });
-      }).toThrow(/Event fragment with id test-nonexistingid does not exist\./u);
-    });
-
-    describe('when id includes "transaction-submitted"', function () {
-      it('creates and stores new fragment props with canDeleteIfAbandoned set to true', function () {
-        const metaMetricsController = getMetaMetricsController();
-        const MOCK_ID = 'transaction-submitted-1111';
-        const MOCK_PROPS_TO_UPDATE = {
-          properties: {
-            test: 1,
-          },
-        };
-
-        metaMetricsController.updateEventFragment(
-          MOCK_ID,
-          MOCK_PROPS_TO_UPDATE,
-        );
-
-        const resultFragment = metaMetricsController.state.fragments[MOCK_ID];
-        const expectedPartialFragment = {
-          ...MOCK_PROPS_TO_UPDATE,
-          category: 'Transactions',
-          canDeleteIfAbandoned: true,
-          id: MOCK_ID,
-          lastUpdated: 1730798303333,
-          successEvent: 'Transaction Finalized',
-        };
-        expect(resultFragment).toStrictEqual(expectedPartialFragment);
-      });
-    });
-  });
-
-  describe('generateMetaMetricsId', function () {
-    it('should generate an 0x prefixed hex string', function () {
-      const metaMetricsController = getMetaMetricsController();
-      expect(
-        metaMetricsController.generateMetaMetricsId().startsWith('0x'),
-      ).toStrictEqual(true);
-    });
-  });
-
-  describe('getMetaMetricsId', function () {
-    it('should generate or return the metametrics id', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: null,
-      });
-
-      // Starts off being empty.
-      expect(metaMetricsController.state.metaMetricsId).toStrictEqual(null);
-
-      // Create a new metametrics id.
-      const clientMetaMetricsId = metaMetricsController.getMetaMetricsId();
-      expect(clientMetaMetricsId.startsWith('0x')).toStrictEqual(true);
-
-      // Return same metametrics id.
-      const sameMetaMetricsId = metaMetricsController.getMetaMetricsId();
-      expect(clientMetaMetricsId).toStrictEqual(sameMetaMetricsId);
-    });
-  });
-
-  describe('identify', function () {
-    it('should call segment.identify for valid traits if user is participating in metametrics', function () {
-      const spy = jest.spyOn(segmentMock, 'identify');
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-      });
-      metaMetricsController.identify({
-        ...MOCK_TRAITS,
-        ...MOCK_INVALID_TRAITS,
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          userId: TEST_META_METRICS_ID,
-          traits: MOCK_TRAITS,
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should transform date type traits into ISO-8601 timestamp strings', function () {
-      const spy = jest.spyOn(segmentMock, 'identify');
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-      });
-      metaMetricsController.identify({
-        test_date: new Date().toISOString(),
-      } as MetaMetricsUserTraits);
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          userId: TEST_META_METRICS_ID,
-          traits: {
-            test_date: new Date().toISOString(),
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should not call segment.identify if user is not participating in metametrics', function () {
-      const spy = jest.spyOn(segmentMock, 'identify');
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: false,
-      });
-      metaMetricsController.identify(MOCK_TRAITS);
-      expect(spy).toHaveBeenCalledTimes(0);
-    });
-
-    it('should not call segment.identify if there are no valid traits to identify', function () {
-      const spy = jest.spyOn(segmentMock, 'identify');
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-      });
-      metaMetricsController.identify(MOCK_INVALID_TRAITS);
-      expect(spy).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('setParticipateInMetaMetrics', function () {
-    it('should update the value of participateInMetaMetrics', async function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: null,
-        metaMetricsId: null,
-      });
-      expect(
-        metaMetricsController.state.participateInMetaMetrics,
-      ).toStrictEqual(null);
-      await metaMetricsController.setParticipateInMetaMetrics(true);
-      expect(
-        metaMetricsController.state.participateInMetaMetrics,
-      ).toStrictEqual(true);
-      await metaMetricsController.setParticipateInMetaMetrics(false);
-      expect(
-        metaMetricsController.state.participateInMetaMetrics,
-      ).toStrictEqual(false);
-    });
-    it('should generate and update the metaMetricsId when set to true', async function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: null,
-        metaMetricsId: null,
-      });
-      expect(metaMetricsController.state.metaMetricsId).toStrictEqual(null);
-      await metaMetricsController.setParticipateInMetaMetrics(true);
-      expect(typeof metaMetricsController.state.metaMetricsId).toStrictEqual(
-        'string',
-      );
-    });
-    it('should not nullify the metaMetricsId when set to false', async function () {
-      const metaMetricsController = getMetaMetricsController();
-      await metaMetricsController.setParticipateInMetaMetrics(false);
-      expect(metaMetricsController.state.metaMetricsId).toStrictEqual(
-        TEST_META_METRICS_ID,
-      );
-    });
-    it('should nullify the marketingCampaignCookieId when participateInMetaMetrics is toggled off', async function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-        dataCollectionForMarketing: true,
-        marketingCampaignCookieId: TEST_GA_COOKIE_ID,
-      });
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(TEST_GA_COOKIE_ID);
-      await metaMetricsController.setParticipateInMetaMetrics(false);
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(null);
-    });
-  });
-
-  describe('submitEvent', function () {
-    it('should not track an event if user is not participating in metametrics', function () {
-      const spy = jest.spyOn(segmentMock, 'track');
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: false,
-      });
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        properties: {
-          chain_id: '1',
-        },
-      });
-      expect(spy).toHaveBeenCalledTimes(0);
-    });
-
-    it('should track an event if user has not opted in, but isOptIn is true', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-      });
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent(
-        {
-          event: 'Fake Event',
-          category: 'Unit Test',
-          properties: {
-            chain_id: '1',
-          },
-        },
-        { isOptIn: true },
-      );
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: '1',
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should track an event during optin and allow for metaMetricsId override', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-      });
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent(
-        {
-          event: 'Fake Event',
-          category: 'Unit Test',
-          properties: {
-            chain_id: '1',
-          },
-        },
-        { isOptIn: true, metaMetricsId: 'TESTID' },
-      );
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: 'TESTID',
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: '1',
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should track a legacy event', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent(
-        {
-          event: 'Fake Event',
-          category: 'Unit Test',
-          properties: {
-            chain_id: '1',
-          },
-        },
-        { matomoEvent: true },
-      );
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            legacy_event: true,
-            chain_id: '1',
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should track a non legacy event', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        properties: {
-          chain_id: '1',
-        },
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: '1',
-          },
-          context: DEFAULT_TEST_CONTEXT,
-          userId: TEST_META_METRICS_ID,
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should immediately flush queue if flushImmediately set to true', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'flush');
-      metaMetricsController.submitEvent(
-        {
-          event: 'Fake Event',
-          category: 'Unit Test',
-        },
-        { flushImmediately: true },
-      );
-      expect(spy).not.toThrow();
-    });
-
-    it('should throw if event or category not provided', async function () {
-      const metaMetricsController = getMetaMetricsController();
-
-      await expect(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error because we are testing the error case
-        metaMetricsController.submitEvent({ event: 'test' }),
-      ).rejects.toThrow(/Must specify event and category\./u);
-
-      await expect(
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error because we are testing the error case
-        metaMetricsController.submitEvent({ category: 'test' }),
-      ).rejects.toThrow(/Must specify event and category\./u);
-    });
-
-    it('should throw if provided sensitiveProperties, when excludeMetaMetricsId is true', async function () {
-      const metaMetricsController = getMetaMetricsController();
-      await expect(
-        metaMetricsController.submitEvent(
-          {
-            event: 'Fake Event',
-            category: 'Unit Test',
-            sensitiveProperties: { foo: 'bar' },
-          },
-          { excludeMetaMetricsId: true },
-        ),
-      ).rejects.toThrow(
-        /sensitiveProperties was specified in an event payload that also set the excludeMetaMetricsId flag/u,
-      );
-    });
-
-    it('should track sensitiveProperties in a separate, anonymous event', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: DEFAULT_EVENT_PROPERTIES,
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[1][1],
-      );
-    });
-  });
-
-  describe('Change Signature XXX anonymous event names', function () {
-    // @ts-expect-error This function is missing from the Mocha type definitions
-    it.each([
-      ['Signature Requested', 'Signature Requested Anon'],
-      ['Signature Rejected', 'Signature Rejected Anon'],
-      ['Signature Approved', 'Signature Approved Anon'],
-    ])(
-      'should change "%s" anonymous event names to "%s"',
-      (eventType: string, anonEventType: string) => {
-        const metaMetricsController = getMetaMetricsController();
-        const spy = jest.spyOn(segmentMock, 'track');
-        metaMetricsController.submitEvent({
-          event: eventType,
-          category: 'Unit Test',
-          properties: { ...DEFAULT_EVENT_PROPERTIES },
-          sensitiveProperties: { foo: 'bar' },
-        });
-
-        expect(spy).toHaveBeenCalledTimes(2);
-
-        expect(spy.mock.calls[0][0]).toMatchObject({
-          event: anonEventType,
-          properties: { foo: 'bar', ...DEFAULT_EVENT_PROPERTIES },
-        });
-
-        expect(spy.mock.calls[1][0]).toMatchObject({
-          event: eventType,
-          properties: { ...DEFAULT_EVENT_PROPERTIES },
-        });
-      },
-    );
-  });
-
-  describe('Change Transaction XXX anonymous event namnes', function () {
-    it('should change "Transaction Added" anonymous event names to "Transaction Added Anon"', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Transaction Added',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: `Transaction Added Anon`,
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should change "Transaction Submitted" anonymous event names to "Transaction Added Anon"', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Transaction Submitted',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: `Transaction Submitted Anon`,
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should change "Transaction Finalized" anonymous event names to "Transaction Added Anon"', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Transaction Finalized',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: `Transaction Finalized Anon`,
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-  });
-
-  describe('trackPage', function () {
-    it('should track a page view', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'page');
-      metaMetricsController.trackPage({
-        name: 'home',
-        environmentType: ENVIRONMENT_TYPE_BACKGROUND,
-        page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          name: 'home',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            params: undefined,
-            ...DEFAULT_PAGE_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should not track a page view if user is not participating in metametrics', function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: false,
-      });
-      const spy = jest.spyOn(segmentMock, 'page');
-      metaMetricsController.trackPage({
-        name: 'home',
-        environmentType: ENVIRONMENT_TYPE_BACKGROUND,
-        page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-      });
-      expect(spy).toHaveBeenCalledTimes(0);
-    });
-
-    it('should track a page view if isOptInPath is true and user not yet opted in', function () {
-      const metaMetricsController = getMetaMetricsController({
-        currentLocale: LOCALE,
-        participateInMetaMetrics: true,
-        onPreferencesStateChange: jest.fn(),
-      });
-      const spy = jest.spyOn(segmentMock, 'page');
-      metaMetricsController.trackPage(
-        {
-          name: 'home',
-          environmentType: ENVIRONMENT_TYPE_BACKGROUND,
-          page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-        },
-        { isOptInPath: true },
-      );
-
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          name: 'home',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_PAGE_PROPERTIES,
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('multiple trackPage call with same actionId should result in same messageId being sent to segment', function () {
-      const metaMetricsController = getMetaMetricsController({
-        currentLocale: LOCALE,
-        participateInMetaMetrics: true,
-        onPreferencesStateChange: jest.fn(),
-      });
-      const spy = jest.spyOn(segmentMock, 'page');
-      metaMetricsController.trackPage(
-        {
-          name: 'home',
-          actionId: DUMMY_ACTION_ID,
-          environmentType: ENVIRONMENT_TYPE_BACKGROUND,
-          page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-        },
-        { isOptInPath: true },
-      );
-      metaMetricsController.trackPage(
-        {
-          name: 'home',
-          actionId: DUMMY_ACTION_ID,
-          environmentType: ENVIRONMENT_TYPE_BACKGROUND,
-          page: METAMETRICS_BACKGROUND_PAGE_OBJECT,
-        },
-        { isOptInPath: true },
-      );
-
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          name: 'home',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: DEFAULT_PAGE_PROPERTIES,
-          messageId: DUMMY_ACTION_ID,
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-  });
-
-  describe('deterministic messageId', function () {
-    it('should use the actionId as messageId when provided', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        properties: {
-          chain_id: 'bar',
-        },
-        actionId: '0x001',
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: 'bar',
-          },
-          messageId: '0x001',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should append 0x000 to the actionId of anonymized event when tracking sensitiveProperties', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-        actionId: '0x001',
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: '0x001-0x000',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: DEFAULT_EVENT_PROPERTIES,
-          messageId: '0x001',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[1][1],
-      );
-    });
-
-    it('should use the uniqueIdentifier as messageId when provided', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        properties: {
-          chain_id: 'bar',
-        },
-        uniqueIdentifier: 'transaction-submitted-0000',
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: 'bar',
-          },
-          messageId: 'transaction-submitted-0000',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should append 0x000 to the uniqueIdentifier of anonymized event when tracking sensitiveProperties', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-        uniqueIdentifier: 'transaction-submitted-0000',
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: 'transaction-submitted-0000-0x000',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: 'transaction-submitted-0000',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[1][1],
-      );
-    });
-
-    it('should combine the uniqueIdentifier and actionId as messageId when both provided', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        properties: { chain_id: 'bar' },
-        actionId: '0x001',
-        uniqueIdentifier: 'transaction-submitted-0000',
-      });
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: 'bar',
-          },
-          messageId: 'transaction-submitted-0000-0x001',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-
-    it('should append 0x000 to the combined uniqueIdentifier and actionId of anonymized event when tracking sensitiveProperties', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent({
-        event: 'Fake Event',
-        category: 'Unit Test',
-        sensitiveProperties: { foo: 'bar' },
-        actionId: '0x001',
-        uniqueIdentifier: 'transaction-submitted-0000',
-      });
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            foo: 'bar',
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: 'transaction-submitted-0000-0x001-0x000',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          userId: TEST_META_METRICS_ID,
-          context: DEFAULT_TEST_CONTEXT,
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-          },
-          messageId: 'transaction-submitted-0000-0x001',
-          timestamp: new Date(),
-        },
-        spy.mock.calls[1][1],
-      );
-    });
-  });
-
-  describe('_buildUserTraitsObject', function () {
-    it('should return full user traits object on first call', function () {
-      const MOCK_ALL_TOKENS: TokensControllerState['allTokens'] = {
-        [toHex(1)]: {
-          '0x1235ce91d74254f29d4609f25932fe6d97bf4842': [
-            {
-              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
-            },
-            {
-              address: '0xabc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
-            },
-          ] as Token[],
-          '0xe364b0f9d1879e53e8183055c9d7dd2b7375d86b': [
-            {
-              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
-            },
-          ] as Token[],
-        },
-        [toHex(4)]: {
-          '0x1235ce91d74254f29d4609f25932fe6d97bf4842': [
-            {
-              address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
-            },
-            {
-              address: '0x12317F958D2ee523a2206206994597C13D831ec7',
-            },
-          ] as Token[],
-        },
-      };
-
-      const metaMetricsController = getMetaMetricsController();
-      const traits = metaMetricsController._buildUserTraitsObject({
-        addressBook: {
-          [CHAIN_IDS.MAINNET]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-          },
-          [CHAIN_IDS.GOERLI]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x0': {
-              address: '0x0',
-            } as AddressBookEntry,
-          },
-        },
-        allNfts: {
-          '0xac706cE8A9BF27Afecf080fB298d0ee13cfb978A': {
-            [toHex(56)]: [
-              {
-                address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
-                tokenId: '100',
-              },
-              {
-                address: '0xd2cea331e5f5d8ee9fb1055c297795937645de91',
-                tokenId: '101',
-              },
-              {
-                address: '0x7488d2ce5deb26db021285b50b661d655eb3d3d9',
-                tokenId: '99',
-              },
-            ] as Nft[],
-          },
-          '0xe04AB39684A24D8D4124b114F3bd6FBEB779cacA': {
-            [toHex(59)]: [
-              {
-                address: '0x63d646bc7380562376d5de205123a57b1718184d',
-                tokenId: '14',
-              },
-            ] as Nft[],
-          },
-        },
-        allTokens: MOCK_ALL_TOKENS,
-        ...mockNetworkState(
-          { chainId: CHAIN_IDS.MAINNET },
-          { chainId: CHAIN_IDS.GOERLI },
-          { chainId: '0xaf' },
-        ),
-        internalAccounts: {
-          accounts: {
-            mock1: {} as InternalAccount,
-            mock2: {} as InternalAccount,
-          },
-          selectedAccount: 'mock1',
-        },
-        ledgerTransportType: LedgerTransportTypes.webhid,
-        openSeaEnabled: true,
-        useNftDetection: false,
-        securityAlertsEnabled: true,
-        theme: 'default',
-        useTokenDetection: true,
-        ShowNativeTokenAsMainBalance: true,
-        security_providers: [],
-        names: {
-          [NameType.ETHEREUM_ADDRESS]: {
-            '0x123': {
-              '0x1': {
-                name: 'Test 1',
-              } as NameEntry,
-              '0x2': {
-                name: 'Test 2',
-              } as NameEntry,
-              '0x3': {
-                name: null,
-              } as NameEntry,
-            },
-            '0x456': {
-              '0x1': {
-                name: 'Test 3',
-              } as NameEntry,
-            },
-            '0x789': {
-              '0x1': {
-                name: null,
-              } as NameEntry,
-            },
-          },
-        },
-        tokenSortConfig: {
-          key: 'token-sort-key',
-          order: 'dsc',
-          sortCallback: 'stringNumeric',
-        },
-        participateInMetaMetrics: true,
-        currentCurrency: 'usd',
-        dataCollectionForMarketing: false,
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        custodyAccountDetails: {},
-        ///: END:ONLY_INCLUDE_IF
-      });
-
-      expect(traits).toStrictEqual({
-        [MetaMetricsUserTrait.AddressBookEntries]: 3,
-        [MetaMetricsUserTrait.InstallDateExt]: '',
-        [MetaMetricsUserTrait.LedgerConnectionType]:
-          LedgerTransportTypes.webhid,
-        [MetaMetricsUserTrait.NetworksAdded]: [
-          CHAIN_IDS.MAINNET,
-          CHAIN_IDS.GOERLI,
-          '0xaf',
-        ],
-        [MetaMetricsUserTrait.NetworksWithoutTicker]: ['0xaf'],
-        [MetaMetricsUserTrait.NftAutodetectionEnabled]: false,
-        [MetaMetricsUserTrait.NumberOfAccounts]: 2,
-        [MetaMetricsUserTrait.NumberOfNftCollections]: 3,
-        [MetaMetricsUserTrait.NumberOfNfts]: 4,
-        [MetaMetricsUserTrait.NumberOfTokens]: 5,
-        [MetaMetricsUserTrait.OpenSeaApiEnabled]: true,
-        [MetaMetricsUserTrait.ThreeBoxEnabled]: false,
-        [MetaMetricsUserTrait.Theme]: 'default',
-        [MetaMetricsUserTrait.TokenDetectionEnabled]: true,
-        [MetaMetricsUserTrait.ShowNativeTokenAsMainBalance]: true,
-        [MetaMetricsUserTrait.CurrentCurrency]: 'usd',
-        [MetaMetricsUserTrait.HasMarketingConsent]: false,
-        [MetaMetricsUserTrait.SecurityProviders]: ['blockaid'],
-        [MetaMetricsUserTrait.IsMetricsOptedIn]: true,
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        [MetaMetricsUserTrait.MmiExtensionId]: 'testid',
-        [MetaMetricsUserTrait.MmiAccountAddress]: null,
-        [MetaMetricsUserTrait.MmiIsCustodian]: false,
-        ///: END:ONLY_INCLUDE_IF
-        ///: BEGIN:ONLY_INCLUDE_IF(petnames)
-        [MetaMetricsUserTrait.PetnameAddressCount]: 3,
-        ///: END:ONLY_INCLUDE_IF
-        [MetaMetricsUserTrait.TokenSortPreference]: 'token-sort-key',
-      });
-    });
-
-    it('should return only changed traits object on subsequent calls', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const networkState = mockNetworkState(
-        { chainId: CHAIN_IDS.MAINNET },
-        { chainId: CHAIN_IDS.GOERLI },
-      );
-      metaMetricsController._buildUserTraitsObject({
-        addressBook: {
-          [CHAIN_IDS.MAINNET]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-          },
-          [CHAIN_IDS.GOERLI]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x0': {
-              address: '0x0',
-            } as AddressBookEntry,
-          },
-        },
-        allTokens: {},
-        ...networkState,
-        ledgerTransportType: LedgerTransportTypes.webhid,
-        openSeaEnabled: true,
-        internalAccounts: {
-          accounts: {
-            mock1: {} as InternalAccount,
-            mock2: {} as InternalAccount,
-          },
-          selectedAccount: 'mock1',
-        },
-        useNftDetection: false,
-        theme: 'default',
-        useTokenDetection: true,
-        tokenSortConfig: {
-          key: 'token-sort-key',
-          order: 'dsc',
-          sortCallback: 'stringNumeric',
-        },
-        ShowNativeTokenAsMainBalance: true,
-        allNfts: {},
-        participateInMetaMetrics: true,
-        dataCollectionForMarketing: false,
-        securityAlertsEnabled: true,
-        names: {
-          ethereumAddress: {},
-        },
-        security_providers: ['blockaid'],
-        currentCurrency: 'usd',
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        custodyAccountDetails: {},
-        ///: END:ONLY_INCLUDE_IF
-      });
-
-      const updatedTraits = metaMetricsController._buildUserTraitsObject({
-        addressBook: {
-          [CHAIN_IDS.MAINNET]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x1': {
-              address: '0x1',
-            } as AddressBookEntry,
-          },
-          [CHAIN_IDS.GOERLI]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x0': {
-              address: '0x0',
-            } as AddressBookEntry,
-          },
-        },
-        allTokens: {
-          [toHex(1)]: {
-            '0xabcde': [{ address: '0xtestAddress' } as Token],
-          },
-        },
-        ...networkState,
-        ledgerTransportType: LedgerTransportTypes.webhid,
-        openSeaEnabled: false,
-        internalAccounts: {
-          accounts: {
-            mock1: {} as InternalAccount,
-            mock2: {} as InternalAccount,
-            mock3: {} as InternalAccount,
-          },
-          selectedAccount: 'mock1',
-        },
-        useNftDetection: false,
-        theme: 'default',
-        useTokenDetection: true,
-        tokenSortConfig: {
-          key: 'token-sort-key',
-          order: 'dsc',
-          sortCallback: 'stringNumeric',
-        },
-        ShowNativeTokenAsMainBalance: false,
-        names: {
-          ethereumAddress: {},
-        },
-        security_providers: ['blockaid'],
-        currentCurrency: 'usd',
-        allNfts: {},
-        participateInMetaMetrics: true,
-        dataCollectionForMarketing: false,
-        securityAlertsEnabled: true,
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        custodyAccountDetails: {},
-        ///: END:ONLY_INCLUDE_IF
-      });
-
-      expect(updatedTraits).toStrictEqual({
-        [MetaMetricsUserTrait.AddressBookEntries]: 4,
-        [MetaMetricsUserTrait.NumberOfAccounts]: 3,
-        [MetaMetricsUserTrait.NumberOfTokens]: 1,
-        [MetaMetricsUserTrait.OpenSeaApiEnabled]: false,
-        [MetaMetricsUserTrait.ShowNativeTokenAsMainBalance]: false,
-      });
-    });
-
-    it('should return null if no traits changed', function () {
-      const metaMetricsController = getMetaMetricsController();
-      const networkState = mockNetworkState(
-        { chainId: CHAIN_IDS.MAINNET },
-        { chainId: CHAIN_IDS.GOERLI },
-      );
-      metaMetricsController._buildUserTraitsObject({
-        addressBook: {
-          [CHAIN_IDS.MAINNET]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-          },
-          [CHAIN_IDS.GOERLI]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x0': {
-              address: '0x0',
-            } as AddressBookEntry,
-          },
-        },
-        allTokens: {},
-        ...networkState,
-        ledgerTransportType: LedgerTransportTypes.webhid,
-        openSeaEnabled: true,
-        internalAccounts: {
-          accounts: {
-            mock1: {} as InternalAccount,
-            mock2: {} as InternalAccount,
-          },
-          selectedAccount: 'mock1',
-        },
-        useNftDetection: true,
-        theme: 'default',
-        useTokenDetection: true,
-        tokenSortConfig: {
-          key: 'token-sort-key',
-          order: 'dsc',
-          sortCallback: 'stringNumeric',
-        },
-        ShowNativeTokenAsMainBalance: true,
-        allNfts: {},
-        names: {
-          ethereumAddress: {},
-        },
-        participateInMetaMetrics: true,
-        dataCollectionForMarketing: false,
-        securityAlertsEnabled: true,
-        security_providers: ['blockaid'],
-        currentCurrency: 'usd',
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        custodyAccountDetails: {},
-        ///: END:ONLY_INCLUDE_IF
-      });
-
-      const updatedTraits = metaMetricsController._buildUserTraitsObject({
-        addressBook: {
-          [CHAIN_IDS.MAINNET]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-          },
-          [CHAIN_IDS.GOERLI]: {
-            '0x': {
-              address: '0x',
-            } as AddressBookEntry,
-            '0x0': { address: '0x0' } as AddressBookEntry,
-          },
-        },
-        allTokens: {},
-        ...networkState,
-        ledgerTransportType: LedgerTransportTypes.webhid,
-        openSeaEnabled: true,
-        internalAccounts: {
-          accounts: {
-            mock1: {} as InternalAccount,
-            mock2: {} as InternalAccount,
-          },
-          selectedAccount: 'mock1',
-        },
-        useNftDetection: true,
-        theme: 'default',
-        useTokenDetection: true,
-        tokenSortConfig: {
-          key: 'token-sort-key',
-          order: 'dsc',
-          sortCallback: 'stringNumeric',
-        },
-        ShowNativeTokenAsMainBalance: true,
-        allNfts: {},
-        participateInMetaMetrics: true,
-        dataCollectionForMarketing: false,
-        names: {
-          ethereumAddress: {},
-        },
-        securityAlertsEnabled: true,
-        security_providers: ['blockaid'],
-        currentCurrency: 'usd',
-        ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-        custodyAccountDetails: {},
-        ///: END:ONLY_INCLUDE_IF
-      });
-      expect(updatedTraits).toStrictEqual(null);
-    });
-  });
-
-  describe('submitting segmentApiCalls to segment SDK', function () {
-    it('should add event to store when submitting to SDK', function () {
-      const metaMetricsController = getMetaMetricsController({});
-      metaMetricsController.trackPage({}, { isOptInPath: true });
-      const { segmentApiCalls } = metaMetricsController.store.getState();
-      expect(Object.keys(segmentApiCalls).length > 0).toStrictEqual(true);
-    });
-
-    it('should remove event from store when callback is invoked', function () {
-      const segmentInstance = createSegmentMock(2);
-      const stubFn = (...args: unknown[]) => {
-        const cb = args[1] as () => void;
-        cb();
-      };
-      jest.spyOn(segmentInstance, 'track').mockImplementation(stubFn);
-      jest.spyOn(segmentInstance, 'page').mockImplementation(stubFn);
-
-      const metaMetricsController = getMetaMetricsController({
-        segment: segmentInstance,
-      });
-      metaMetricsController.trackPage({}, { isOptInPath: true });
-      const { segmentApiCalls } = metaMetricsController.store.getState();
-      expect(Object.keys(segmentApiCalls).length === 0).toStrictEqual(true);
-    });
-  });
-  describe('setMarketingCampaignCookieId', function () {
-    it('should update marketingCampaignCookieId in the context when cookieId is available', async function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-        dataCollectionForMarketing: true,
-      });
-      metaMetricsController.setMarketingCampaignCookieId(TEST_GA_COOKIE_ID);
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(TEST_GA_COOKIE_ID);
-      const spy = jest.spyOn(segmentMock, 'track');
-      metaMetricsController.submitEvent(
-        {
-          event: 'Fake Event',
-          category: 'Unit Test',
-          properties: {
-            chain_id: '1',
-          },
-        },
-        { isOptIn: true },
-      );
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(
-        {
-          event: 'Fake Event',
-          anonymousId: METAMETRICS_ANONYMOUS_ID,
-          context: {
-            ...DEFAULT_TEST_CONTEXT,
-            marketingCampaignCookieId: TEST_GA_COOKIE_ID,
-          },
-          properties: {
-            ...DEFAULT_EVENT_PROPERTIES,
-            chain_id: '1',
-          },
-          messageId: Utils.generateRandomId(),
-          timestamp: new Date(),
-        },
-        spy.mock.calls[0][1],
-      );
-    });
-  });
-  describe('setDataCollectionForMarketing', function () {
-    it('should nullify the marketingCampaignCookieId when Data collection for marketing is toggled off', async function () {
-      const metaMetricsController = getMetaMetricsController({
-        participateInMetaMetrics: true,
-        metaMetricsId: TEST_META_METRICS_ID,
-        dataCollectionForMarketing: true,
-        marketingCampaignCookieId: TEST_GA_COOKIE_ID,
-      });
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(TEST_GA_COOKIE_ID);
-      await metaMetricsController.setDataCollectionForMarketing(false);
-      expect(
-        metaMetricsController.state.marketingCampaignCookieId,
-      ).toStrictEqual(null);
-    });
-  });
-  afterEach(function () {
-    // flush the queues manually after each test
-    segmentMock.flush();
-    jest.useRealTimers();
-    jest.restoreAllMocks();
-  });
-});
diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
index 479c4cb0f14d..71c8329b3dcd 100644
--- a/app/scripts/controllers/mmi-controller.test.ts
+++ b/app/scripts/controllers/mmi-controller.test.ts
@@ -21,11 +21,11 @@ import { MMIController, AllowedActions } from './mmi-controller';
 import { AppStateController } from './app-state-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { mmiKeyringBuilderFactory } from '../mmi-keyring-builder-factory';
-import MetaMetricsController from './metametrics';
 import { ETH_EOA_METHODS } from '../../../shared/constants/eth-methods';
 import { mockNetworkState } from '../../../test/stub/networks';
 import { InfuraNetworkType } from '@metamask/controller-utils';
 import { API_REQUEST_LOG_EVENT } from '@metamask-institutional/sdk';
+import { getDefaultPreferencesControllerState } from './preferences-controller';
 
 jest.mock('@metamask-institutional/portfolio-dashboard', () => ({
   handleMmiPortfolio: jest.fn(),
@@ -90,7 +90,6 @@ describe('MMIController', function () {
     controllerMessenger,
     accountsController,
     keyringController,
-    metaMetricsController,
     custodyController,
     mmiControllerMessenger;
 
@@ -106,9 +105,9 @@ describe('MMIController', function () {
     };
 
     const controllerMessenger = new ControllerMessenger<
-    AllowedActions,
-    never
-  >();
+      AllowedActions,
+      never
+    >();
 
     accountsController = new AccountsController({
       messenger: controllerMessenger.getRestricted({
@@ -207,18 +206,18 @@ describe('MMIController', function () {
       },
     });
 
-    metaMetricsController = new MetaMetricsController({
-      preferencesControllerState: {
-        currentLocale: 'en'
-      },
-      onPreferencesStateChange: jest.fn(),
-      getCurrentChainId: jest.fn(),
-      onNetworkDidChange: jest.fn(),
-    });
+    controllerMessenger.registerActionHandler(
+      'MetaMetricsController:getState',
+      () => ({
+        metaMetricsId: mockMetaMetricsId,
+      }),
+    );
 
     controllerMessenger.registerActionHandler(
       'NetworkController:getState',
-      jest.fn().mockReturnValue(mockNetworkState({ chainId: CHAIN_IDS.SEPOLIA })),
+      jest
+        .fn()
+        .mockReturnValue(mockNetworkState({ chainId: CHAIN_IDS.SEPOLIA })),
     );
 
     controllerMessenger.registerActionHandler(
@@ -231,7 +230,7 @@ describe('MMIController', function () {
       jest.fn().mockReturnValue({
         configuration: {
           chainId: CHAIN_IDS.SEPOLIA,
-        }
+        },
       }),
     );
 
@@ -248,10 +247,11 @@ describe('MMIController', function () {
         'AccountsController:listAccounts',
         'AccountsController:getSelectedAccount',
         'AccountsController:setSelectedAccount',
+        'MetaMetricsController:getState',
         'NetworkController:getState',
         'NetworkController:setActiveNetwork',
         'NetworkController:getNetworkClientById',
-        'NetworkController:getNetworkConfigurationByChainId'
+        'NetworkController:getNetworkConfigurationByChainId',
       ],
     });
 
@@ -282,12 +282,11 @@ describe('MMIController', function () {
             preferences: {
               autoLockTimeLimit: 0,
             },
-          })
-        }
+          }),
+        },
       }),
       permissionController,
       custodyController,
-      metaMetricsController,
       custodianEventHandlerFactory: jest.fn(),
       getTransactions: jest.fn(),
       updateTransactionHash: jest.fn(),
@@ -302,10 +301,6 @@ describe('MMIController', function () {
     mmiController.getState = jest.fn();
     mmiController.captureException = jest.fn();
     mmiController.accountTrackerController = { syncWithAddresses: jest.fn() };
-
-    jest.spyOn(metaMetricsController.store, 'getState').mockReturnValue({
-      metaMetricsId: mockMetaMetricsId,
-    });
   });
 
   afterEach(() => {
@@ -391,24 +386,30 @@ describe('MMIController', function () {
         getSupportedChains: jest.fn().mockResolvedValue({}),
       };
 
-      mmiController.addKeyringIfNotExists = jest.fn().mockResolvedValue(mockKeyring);
-      mmiController.custodyController.getAllCustodyTypes = jest.fn().mockReturnValue(['mock-custody-type']);
+      mmiController.addKeyringIfNotExists = jest
+        .fn()
+        .mockResolvedValue(mockKeyring);
+      mmiController.custodyController.getAllCustodyTypes = jest
+        .fn()
+        .mockReturnValue(['mock-custody-type']);
       mmiController.logAndStoreApiRequest = jest.fn();
 
       await mmiController.onSubmitPassword();
 
       expect(mockKeyring.on).toHaveBeenCalledWith(
         API_REQUEST_LOG_EVENT,
-        expect.any(Function)
+        expect.any(Function),
       );
 
       const mockLogData = { someKey: 'someValue' };
       const apiRequestLogEventHandler = mockKeyring.on.mock.calls.find(
-        call => call[0] === API_REQUEST_LOG_EVENT
+        (call) => call[0] === API_REQUEST_LOG_EVENT,
       )[1];
       apiRequestLogEventHandler(mockLogData);
 
-      expect(mmiController.logAndStoreApiRequest).toHaveBeenCalledWith(mockLogData);
+      expect(mmiController.logAndStoreApiRequest).toHaveBeenCalledWith(
+        mockLogData,
+      );
     });
   });
 
@@ -489,29 +490,41 @@ describe('MMIController', function () {
         getStatusMap: jest.fn(),
       };
 
-      mmiController.addKeyringIfNotExists = jest.fn().mockResolvedValue(mockKeyring);
-      mmiController.keyringController.getAccounts = jest.fn().mockResolvedValue(['0x2']);
-      mmiController.keyringController.addNewAccountForKeyring = jest.fn().mockResolvedValue('0x3');
+      mmiController.addKeyringIfNotExists = jest
+        .fn()
+        .mockResolvedValue(mockKeyring);
+      mmiController.keyringController.getAccounts = jest
+        .fn()
+        .mockResolvedValue(['0x2']);
+      mmiController.keyringController.addNewAccountForKeyring = jest
+        .fn()
+        .mockResolvedValue('0x3');
       mmiController.custodyController.setAccountDetails = jest.fn();
       mmiController.accountTrackerController.syncWithAddresses = jest.fn();
       mmiController.storeCustodianSupportedChains = jest.fn();
       mmiController.custodyController.storeCustodyStatusMap = jest.fn();
       mmiController.logAndStoreApiRequest = jest.fn();
 
-      await mmiController.connectCustodyAddresses(custodianType, custodianName, accounts);
+      await mmiController.connectCustodyAddresses(
+        custodianType,
+        custodianName,
+        accounts,
+      );
 
       expect(mockKeyring.on).toHaveBeenCalledWith(
         API_REQUEST_LOG_EVENT,
-        expect.any(Function)
+        expect.any(Function),
       );
 
       const mockLogData = { someKey: 'someValue' };
       const apiRequestLogEventHandler = mockKeyring.on.mock.calls.find(
-        call => call[0] === API_REQUEST_LOG_EVENT
+        (call) => call[0] === API_REQUEST_LOG_EVENT,
       )[1];
       apiRequestLogEventHandler(mockLogData);
 
-      expect(mmiController.logAndStoreApiRequest).toHaveBeenCalledWith(mockLogData);
+      expect(mmiController.logAndStoreApiRequest).toHaveBeenCalledWith(
+        mockLogData,
+      );
     });
   });
 
@@ -538,7 +551,9 @@ describe('MMIController', function () {
       CUSTODIAN_TYPES['CUSTODIAN-TYPE'] = {
         keyringClass: { type: 'mock-keyring-class' },
       };
-      jest.spyOn(mmiControllerMessenger, 'call').mockReturnValue({ address: '0x1' });
+      jest
+        .spyOn(mmiControllerMessenger, 'call')
+        .mockReturnValue({ address: '0x1' });
       mmiController.custodyController.getCustodyTypeByAddress = jest
         .fn()
         .mockReturnValue('custodian-type');
@@ -657,7 +672,9 @@ describe('MMIController', function () {
       mmiController.custodyController.getAccountDetails = jest
         .fn()
         .mockReturnValue({});
-        jest.spyOn(mmiControllerMessenger, 'call').mockReturnValue([mockAccount, mockAccount2]);
+      jest
+        .spyOn(mmiControllerMessenger, 'call')
+        .mockReturnValue([mockAccount, mockAccount2]);
       mmiController.mmiConfigurationController.store.getState = jest
         .fn()
         .mockReturnValue({
@@ -890,11 +907,15 @@ describe('MMIController', function () {
       const mockLogData = { someKey: 'someValue' };
       const mockSanitizedLogs = { sanitizedKey: 'sanitizedValue' };
 
-      mmiController.custodyController.sanitizeAndLogApiCall = jest.fn().mockResolvedValue(mockSanitizedLogs);
+      mmiController.custodyController.sanitizeAndLogApiCall = jest
+        .fn()
+        .mockResolvedValue(mockSanitizedLogs);
 
       const result = await mmiController.logAndStoreApiRequest(mockLogData);
 
-      expect(mmiController.custodyController.sanitizeAndLogApiCall).toHaveBeenCalledWith(mockLogData);
+      expect(
+        mmiController.custodyController.sanitizeAndLogApiCall,
+      ).toHaveBeenCalledWith(mockLogData);
       expect(result).toEqual(mockSanitizedLogs);
     });
 
@@ -902,9 +923,13 @@ describe('MMIController', function () {
       const mockLogData = { someKey: 'someValue' };
       const mockError = new Error('Sanitize error');
 
-      mmiController.custodyController.sanitizeAndLogApiCall = jest.fn().mockRejectedValue(mockError);
+      mmiController.custodyController.sanitizeAndLogApiCall = jest
+        .fn()
+        .mockRejectedValue(mockError);
 
-      await expect(mmiController.logAndStoreApiRequest(mockLogData)).rejects.toThrow('Sanitize error');
+      await expect(
+        mmiController.logAndStoreApiRequest(mockLogData),
+      ).rejects.toThrow('Sanitize error');
     });
   });
 });
diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index ac8de8b76656..33923f02bde2 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -42,7 +42,6 @@ import {
   ConnectionRequest,
   MMIControllerMessenger,
 } from '../../../shared/constants/mmi-controller';
-import MetaMetricsController from './metametrics';
 import { getPermissionBackgroundApiMethods } from './permissions';
 import AccountTrackerController from './account-tracker-controller';
 import { AppStateController } from './app-state-controller';
@@ -85,8 +84,6 @@ export class MMIController {
 
   private accountTrackerController: AccountTrackerController;
 
-  private metaMetricsController: MetaMetricsController;
-
   #networkControllerState: NetworkState;
 
   // TODO: Replace `any` with type
@@ -141,7 +138,6 @@ export class MMIController {
     this.getState = opts.getState;
     this.getPendingNonce = opts.getPendingNonce;
     this.accountTrackerController = opts.accountTrackerController;
-    this.metaMetricsController = opts.metaMetricsController;
     this.permissionController = opts.permissionController;
     this.signatureController = opts.signatureController;
     this.platform = opts.platform;
@@ -767,7 +763,9 @@ export class MMIController {
           name: internalAccount.metadata.name,
         };
       });
-    const { metaMetricsId } = this.metaMetricsController.store.getState();
+    const { metaMetricsId } = this.messagingSystem.call(
+      'MetaMetricsController:getState',
+    );
     const getAccountDetails = (address: string) =>
       this.custodyController.getAccountDetails(address);
     const extensionId = this.extension.runtime.id;
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index cb57c681649f..27358d18f543 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -189,8 +189,6 @@ function finalizeSignatureFragment(
  * signature requests
  *
  * @param {object} opts - options for the rpc method tracking middleware
- * @param {Function} opts.getMetricsState - get the state of
- *  MetaMetricsController
  * @param {number} [opts.rateLimitTimeout] - time, in milliseconds, to wait before
  *  allowing another set of events to be tracked for methods rate limited by timeout.
  * @param {number} [opts.rateLimitSamplePercent] - percentage, in decimal, of events
@@ -209,7 +207,6 @@ function finalizeSignatureFragment(
  */
 
 export default function createRPCMethodTrackingMiddleware({
-  getMetricsState,
   rateLimitTimeout = 60 * 5 * 1000, // 5 minutes
   rateLimitSamplePercent = 0.001, // 0.1%
   globalRateLimitTimeout = 60 * 5 * 1000, // 5 minutes
@@ -256,7 +253,7 @@ export default function createRPCMethodTrackingMiddleware({
     // anything. This is extra redundancy because this value is checked in
     // the metametrics controller's trackEvent method as well.
     const userParticipatingInMetaMetrics =
-      getMetricsState().participateInMetaMetrics === true;
+      metaMetricsController.state.participateInMetaMetrics === true;
 
     // Get the event type, each of which has APPROVED, REJECTED and REQUESTED
     // keys for the various events in the flow.
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index 244a995bf5f7..9ebb3f92130b 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -1,7 +1,8 @@
 import { errorCodes } from '@metamask/rpc-errors';
 import { detectSIWE } from '@metamask/controller-utils';
+import { ControllerMessenger } from '@metamask/base-controller';
 
-import MetaMetricsController from '../controllers/metametrics';
+import MetaMetricsController from '../controllers/metametrics-controller';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import {
   MetaMetricsEventCategory,
@@ -17,15 +18,13 @@ import {
   permitSignatureMsg,
   orderSignatureMsg,
 } from '../../../test/data/confirmations/typed_sign';
+import { getDefaultPreferencesControllerState } from '../controllers/preferences-controller';
 import { createSegmentMock } from './segment';
 import createRPCMethodTrackingMiddleware from './createRPCMethodTrackingMiddleware';
 
 const MOCK_ID = '123';
 const expectedUniqueIdentifier = `signature-${MOCK_ID}`;
 
-const metricsState = { participateInMetaMetrics: null };
-const getMetricsState = () => metricsState;
-
 const expectedMetametricsEventUndefinedProps = {
   actionId: undefined,
   currency: undefined,
@@ -54,23 +53,54 @@ const appStateController = {
   },
 };
 
-const metaMetricsController = new MetaMetricsController({
-  segment: createSegmentMock(2, 10000),
-  getCurrentChainId: () => '0x1338',
-  onNetworkDidChange: jest.fn(),
-  preferencesControllerState: {
+const controllerMessenger = new ControllerMessenger();
+
+controllerMessenger.registerActionHandler(
+  'PreferencesController:getState',
+  () => ({
+    ...getDefaultPreferencesControllerState(),
     currentLocale: 'en_US',
-    preferences: {},
-  },
-  onPreferencesStateChange: jest.fn(),
-  version: '0.0.1',
-  environment: 'test',
-  initState: {
-    participateInMetaMetrics: true,
+  }),
+);
+
+controllerMessenger.registerActionHandler(
+  'NetworkController:getState',
+  jest.fn().mockReturnValue({
+    selectedNetworkClientId: 'selectedNetworkClientId',
+  }),
+);
+
+controllerMessenger.registerActionHandler(
+  'NetworkController:getNetworkClientById',
+  jest.fn().mockReturnValue({
+    configuration: {
+      chainId: '0x1338',
+    },
+  }),
+);
+
+const metaMetricsController = new MetaMetricsController({
+  state: {
+    participateInMetaMetrics: null,
     metaMetricsId: '0xabc',
     fragments: {},
     events: {},
   },
+  messenger: controllerMessenger.getRestricted({
+    name: 'MetaMetricsController',
+    allowedActions: [
+      'PreferencesController:getState',
+      'NetworkController:getState',
+      'NetworkController:getNetworkClientById',
+    ],
+    allowedEvents: [
+      'PreferencesController:stateChange',
+      'NetworkController:networkDidChange',
+    ],
+  }),
+  segment: createSegmentMock(2),
+  version: '0.0.1',
+  environment: 'test',
   extension: {
     runtime: {
       id: 'testid',
@@ -81,7 +111,6 @@ const metaMetricsController = new MetaMetricsController({
 
 const createHandler = (opts) =>
   createRPCMethodTrackingMiddleware({
-    getMetricsState,
     rateLimitTimeout: 1000,
     rateLimitSamplePercent: 0.1,
     globalRateLimitTimeout: 0,
@@ -142,7 +171,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
   });
   afterEach(() => {
     jest.resetAllMocks();
-    metricsState.participateInMetaMetrics = null;
+    metaMetricsController.setParticipateInMetaMetrics(null);
   });
 
   describe('before participateInMetaMetrics is set', () => {
@@ -166,7 +195,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
   describe('participateInMetaMetrics is set to false', () => {
     beforeEach(() => {
-      metricsState.participateInMetaMetrics = false;
+      metaMetricsController.setParticipateInMetaMetrics(false);
     });
 
     it('should not track an event for a signature request', async () => {
@@ -189,7 +218,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
   describe('participateInMetaMetrics is set to true', () => {
     beforeEach(() => {
-      metricsState.participateInMetaMetrics = true;
+      metaMetricsController.setParticipateInMetaMetrics(true);
     });
 
     it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event`, async () => {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d43c12ff24a1..a49e286af752 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -308,7 +308,7 @@ import OnboardingController from './controllers/onboarding';
 import Backup from './lib/backup';
 import DecryptMessageController from './controllers/decrypt-message';
 import SwapsController from './controllers/swaps';
-import MetaMetricsController from './controllers/metametrics';
+import MetaMetricsController from './controllers/metametrics-controller';
 import { segment } from './lib/segment';
 import createMetaRPCHandler from './lib/createMetaRPCHandler';
 import {
@@ -764,23 +764,23 @@ export default class MetamaskController extends EventEmitter {
       disabled: !this.preferencesController.state.useNftDetection,
     });
 
+    const metaMetricsControllerMessenger =
+      this.controllerMessenger.getRestricted({
+        name: 'MetaMetricsController',
+        allowedActions: [
+          'PreferencesController:getState',
+          'NetworkController:getState',
+          'NetworkController:getNetworkClientById',
+        ],
+        allowedEvents: [
+          'PreferencesController:stateChange',
+          'NetworkController:networkDidChange',
+        ],
+      });
     this.metaMetricsController = new MetaMetricsController({
-      initState: initState.MetaMetricsController,
+      state: initState.MetaMetricsController,
+      messenger: metaMetricsControllerMessenger,
       segment,
-      preferencesControllerState: {
-        currentLocale: this.preferencesController.state.currentLocale,
-        selectedAddress: this.preferencesController.state.selectedAddress,
-      },
-      onPreferencesStateChange: preferencesMessenger.subscribe.bind(
-        preferencesMessenger,
-        'PreferencesController:stateChange',
-      ),
-      onNetworkDidChange: networkControllerMessenger.subscribe.bind(
-        networkControllerMessenger,
-        'NetworkController:networkDidChange',
-      ),
-      getCurrentChainId: () =>
-        getCurrentChainId({ metamask: this.networkController.state }),
       version: process.env.METAMASK_VERSION,
       environment: process.env.METAMASK_ENVIRONMENT,
       extension: this.extension,
@@ -795,13 +795,14 @@ export default class MetamaskController extends EventEmitter {
     const metaMetricsDataDeletionMessenger =
       this.controllerMessenger.getRestricted({
         name: 'MetaMetricsDataDeletionController',
+        allowedActions: ['MetaMetricsController:getState'],
+        allowedEvents: [],
       });
     this.metaMetricsDataDeletionController =
       new MetaMetricsDataDeletionController({
         dataDeletionService,
         messenger: metaMetricsDataDeletionMessenger,
         state: initState.metaMetricsDataDeletionController,
-        getMetaMetricsId: () => this.metaMetricsController.state.metaMetricsId,
       });
 
     const gasFeeMessenger = this.controllerMessenger.getRestricted({
@@ -2027,6 +2028,7 @@ export default class MetamaskController extends EventEmitter {
         'AccountsController:listAccounts',
         'AccountsController:getSelectedAccount',
         'AccountsController:setSelectedAccount',
+        'MetaMetricsController:getState',
         'NetworkController:getState',
         'NetworkController:setActiveNetwork',
       ],
@@ -2042,6 +2044,7 @@ export default class MetamaskController extends EventEmitter {
       getState: this.getState.bind(this),
       getPendingNonce: this.getPendingNonce.bind(this),
       accountTrackerController: this.accountTrackerController,
+      networkController: this.networkController,
       metaMetricsController: this.metaMetricsController,
       permissionController: this.permissionController,
       signatureController: this.signatureController,
@@ -2385,7 +2388,7 @@ export default class MetamaskController extends EventEmitter {
       TransactionController: this.txController,
       KeyringController: this.keyringController,
       PreferencesController: this.preferencesController,
-      MetaMetricsController: this.metaMetricsController.store,
+      MetaMetricsController: this.metaMetricsController,
       MetaMetricsDataDeletionController: this.metaMetricsDataDeletionController,
       AddressBookController: this.addressBookController,
       CurrencyController: this.currencyRateController,
@@ -2440,7 +2443,7 @@ export default class MetamaskController extends EventEmitter {
         NetworkController: this.networkController,
         KeyringController: this.keyringController,
         PreferencesController: this.preferencesController,
-        MetaMetricsController: this.metaMetricsController.store,
+        MetaMetricsController: this.metaMetricsController,
         MetaMetricsDataDeletionController:
           this.metaMetricsDataDeletionController,
         AddressBookController: this.addressBookController,
@@ -5346,7 +5349,7 @@ export default class MetamaskController extends EventEmitter {
       metaMetricsId,
       dataCollectionForMarketing,
       participateInMetaMetrics,
-    } = this.metaMetricsController.store.getState();
+    } = this.metaMetricsController.state;
 
     if (
       metaMetricsId &&
@@ -5713,9 +5716,6 @@ export default class MetamaskController extends EventEmitter {
 
     engine.push(
       createRPCMethodTrackingMiddleware({
-        getMetricsState: this.metaMetricsController.store.getState.bind(
-          this.metaMetricsController.store,
-        ),
         getAccountType: this.getAccountType.bind(this),
         getDeviceModel: this.getDeviceModel.bind(this),
         isConfirmationRedesignEnabled,
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 103a24c2463d..a3a1f158886c 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -1,6 +1,18 @@
+import { Json } from '@metamask/utils';
 import type { EnvironmentType } from './app';
 import { LedgerTransportTypes } from './hardware-wallets';
 
+type JsonWithUndefined =
+  | null
+  | boolean
+  | number
+  | string
+  | undefined
+  | Json[]
+  | {
+      [prop: string]: Json;
+    };
+
 /**
  * Used to attach context of where the user was at in the application when the
  * event was triggered. Also included as full details of the current page in
@@ -92,13 +104,14 @@ export type MetaMetricsEventPayload = {
   /**
    * Custom values to track. Keys in this object must be `snake_case`.
    */
-  properties?: object;
+  properties?: Record<string, Json>;
+
   /**
    * Sensitive values to track. These properties will be sent in an additional
    * event that excludes the user's `metaMetricsId`. Keys in this object must be
    * in `snake_case`.
    */
-  sensitiveProperties?: object;
+  sensitiveProperties?: Record<string, Json>;
   /**
    * Amount of currency that the event creates in revenue for MetaMask.
    */
@@ -130,6 +143,13 @@ export type MetaMetricsEventPayload = {
   isDuplicateAnonymizedEvent?: boolean;
 };
 
+export type UnsanitizedMetaMetricsEventPayload = Omit<
+  MetaMetricsEventPayload,
+  'properties'
+> & {
+  properties?: Record<string, JsonWithUndefined>;
+};
+
 export type MetaMetricsEventOptions = {
   /**
    * Whether or not the event happened during the opt-in workflow.
@@ -205,13 +225,13 @@ export type MetaMetricsEventFragment = {
   /**
    * Custom values to track. Keys in this object must be `snake_case`.
    */
-  properties?: object;
+  properties?: Record<string, Json>;
   /**
    * Sensitive values to track. These properties will be sent in an additional
    * event that excludes the user's `metaMetricsId`. Keys in this object must be
    * in `snake_case`.
    */
-  sensitiveProperties?: object;
+  sensitiveProperties?: Record<string, Json>;
   /**
    * Amount of currency that the event creates in revenue for MetaMask.
    */
@@ -858,6 +878,7 @@ export enum QueueType {
 }
 
 export enum MetaMetricsEventAccountImportType {
+  // eslint-disable-next-line @typescript-eslint/no-shadow
   Json = 'json',
   PrivateKey = 'private_key',
   Srp = 'srp',
diff --git a/shared/constants/mmi-controller.ts b/shared/constants/mmi-controller.ts
index 83998fe6e7b9..389734305e1c 100644
--- a/shared/constants/mmi-controller.ts
+++ b/shared/constants/mmi-controller.ts
@@ -23,9 +23,11 @@ import { AppStateController } from '../../app/scripts/controllers/app-state-cont
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import AccountTrackerController from '../../app/scripts/controllers/account-tracker-controller';
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import MetaMetricsController from '../../app/scripts/controllers/metametrics';
+import MetaMetricsController, {
+  MetaMetricsControllerGetStateAction,
+  // TODO: Remove restricted import
+  // eslint-disable-next-line import/no-restricted-paths
+} from '../../app/scripts/controllers/metametrics-controller';
 
 // Unique name for the controller
 const controllerName = 'MMIController';
@@ -47,7 +49,8 @@ export type AllowedActions =
   | NetworkControllerGetStateAction
   | NetworkControllerSetActiveNetworkAction
   | NetworkControllerGetNetworkClientByIdAction
-  | NetworkControllerGetNetworkConfigurationByChainId;
+  | NetworkControllerGetNetworkConfigurationByChainId
+  | MetaMetricsControllerGetStateAction;
 
 /**
  * Messenger type for the {@link MMIController}.
diff --git a/ui/contexts/metametrics.js b/ui/contexts/metametrics.js
index 6445362f1f60..b7870babfbb7 100644
--- a/ui/contexts/metametrics.js
+++ b/ui/contexts/metametrics.js
@@ -26,7 +26,7 @@ import { trackMetaMetricsEvent, trackMetaMetricsPage } from '../store/actions';
 
 // type imports
 /**
- * @typedef {import('../../shared/constants/metametrics').MetaMetricsEventPayload} MetaMetricsEventPayload
+ * @typedef {import('../../shared/constants/metametrics').UnsanitizedMetaMetricsEventPayload} MetaMetricsEventPayload
  * @typedef {import('../../shared/constants/metametrics').MetaMetricsEventOptions} MetaMetricsEventOptions
  * @typedef {import('../../shared/constants/metametrics').MetaMetricsPageObject} MetaMetricsPageObject
  * @typedef {import('../../shared/constants/metametrics').MetaMetricsReferrerObject} MetaMetricsReferrerObject

From 4752afdfc746579099ac25648d63555284b9c74b Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 11 Nov 2024 13:48:01 +0100
Subject: [PATCH 069/111] chore: Bump snaps-utils (#28399)

<!--
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**

Bump `snaps-utils` to release
https://github.com/MetaMask/snaps/commit/f2d8547ba829607eb8e5ec1bbdb48554c803c4c1.
This fixes an oversight when validating origins against
`allowedOrigins`.

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

## **Related issues**

https://github.com/MetaMask/pm-security/issues/350
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 13bddaa69287..39a5bb13b596 100644
--- a/package.json
+++ b/package.json
@@ -345,7 +345,7 @@
     "@metamask/snaps-execution-environments": "^6.9.2",
     "@metamask/snaps-rpc-methods": "^11.5.1",
     "@metamask/snaps-sdk": "^6.10.0",
-    "@metamask/snaps-utils": "^8.5.1",
+    "@metamask/snaps-utils": "^8.5.2",
     "@metamask/solana-wallet-snap": "^0.1.9",
     "@metamask/transaction-controller": "^38.3.0",
     "@metamask/user-operation-controller": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index bb91a8129ac2..95217329e1c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6335,9 +6335,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^8.1.1, @metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.5.0, @metamask/snaps-utils@npm:^8.5.1":
-  version: 8.5.1
-  resolution: "@metamask/snaps-utils@npm:8.5.1"
+"@metamask/snaps-utils@npm:^8.1.1, @metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.5.0, @metamask/snaps-utils@npm:^8.5.2":
+  version: 8.5.2
+  resolution: "@metamask/snaps-utils@npm:8.5.2"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
@@ -6362,7 +6362,7 @@ __metadata:
     semver: "npm:^7.5.4"
     ses: "npm:^1.1.0"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/38c8098c7dfa82bf907d31f77e2d5ffe6a82dca9bf5d633d10ac024f153d94b8124d7ddfb2e3e35befb7af619ebff1900e81476f889011eebdd80b5e12328c30
+  checksum: 10/e5d1344f948473e82d71007d2570272073cf070f40aa7746692a6d5e6f02cfce66a747cf50f439d32b29a3f6588486182453b26973f0d0c1d9f47914591d5790
   languageName: node
   linkType: hard
 
@@ -26586,7 +26586,7 @@ __metadata:
     "@metamask/snaps-execution-environments": "npm:^6.9.2"
     "@metamask/snaps-rpc-methods": "npm:^11.5.1"
     "@metamask/snaps-sdk": "npm:^6.10.0"
-    "@metamask/snaps-utils": "npm:^8.5.1"
+    "@metamask/snaps-utils": "npm:^8.5.2"
     "@metamask/solana-wallet-snap": "npm:^0.1.9"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"

From 3fedf451399f841d040789842ea218a0ef511568 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Mon, 11 Nov 2024 14:12:49 -0600
Subject: [PATCH 070/111] fix: Properly ellipsize long token names (#28392)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Long token names were not being ellilpsized properly; this PR fixes that
issue.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Import token contract `0x1121AcC14c63f3C872BFcA497d10926A6098AAc5` on
Mainnet
2. See super long token list item title
3. See it properly ellipsized
4. Hover over to see full name

## **Screenshots/Recordings**

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

### **Before**

![CleanShot 2024-11-08 at 11 42
53@2x](https://github.com/user-attachments/assets/f19c516d-c93b-421e-a359-77f083ecc453)


### **After**

<img width="364" alt="SCR-20241108-nquw"
src="https://github.com/user-attachments/assets/c90bd571-72e0-414a-9222-56a0ec706aff">



## **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/components/multichain/token-list-item/token-list-item.tsx | 1 +
 1 file changed, 1 insertion(+)

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 bf3968963465..265b334fdb57 100644
--- a/ui/components/multichain/token-list-item/token-list-item.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.tsx
@@ -302,6 +302,7 @@ export const TokenListItem = ({
                     as="span"
                     fontWeight={FontWeight.Medium}
                     variant={TextVariant.bodyMd}
+                    display={Display.Block}
                     ellipsis
                   >
                     {isStakeable ? (

From d887c79d1fd740b488dfef5637db932560df12da Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Mon, 11 Nov 2024 15:59:12 -0600
Subject: [PATCH 071/111] fix: Add metric trait for privacy mode (#28335)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds a user trait for if privacy mode is enabled.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Open debugger
2. Put a breakpoint in `app/scripts/controllers/metametrics.ts`'s
`_buildUserTraitsObject` function
3. See value being passed

## **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/controllers/metametrics-controller.test.ts | 6 ++++++
 app/scripts/controllers/metametrics-controller.ts      | 5 +++++
 shared/constants/metametrics.ts                        | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
index 4d12c06d0fd1..58fad403fdab 100644
--- a/app/scripts/controllers/metametrics-controller.test.ts
+++ b/app/scripts/controllers/metametrics-controller.test.ts
@@ -1453,6 +1453,7 @@ describe('MetaMetricsController', function () {
           participateInMetaMetrics: true,
           currentCurrency: 'usd',
           dataCollectionForMarketing: false,
+          preferences: { privacyMode: true },
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           custodyAccountDetails: {},
           ///: END:ONLY_INCLUDE_IF
@@ -1492,6 +1493,7 @@ describe('MetaMetricsController', function () {
           [MetaMetricsUserTrait.PetnameAddressCount]: 3,
           ///: END:ONLY_INCLUDE_IF
           [MetaMetricsUserTrait.TokenSortPreference]: 'token-sort-key',
+          [MetaMetricsUserTrait.PrivacyModeEnabled]: true,
         });
       });
     });
@@ -1541,6 +1543,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          preferences: { privacyMode: true },
           securityAlertsEnabled: true,
           names: {
             ethereumAddress: {},
@@ -1604,6 +1607,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          preferences: { privacyMode: true },
           securityAlertsEnabled: true,
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           custodyAccountDetails: {},
@@ -1668,6 +1672,7 @@ describe('MetaMetricsController', function () {
           },
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          preferences: { privacyMode: true },
           securityAlertsEnabled: true,
           security_providers: ['blockaid'],
           currentCurrency: 'usd',
@@ -1713,6 +1718,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
+          preferences: { privacyMode: true },
           names: {
             ethereumAddress: {},
           },
diff --git a/app/scripts/controllers/metametrics-controller.ts b/app/scripts/controllers/metametrics-controller.ts
index 25ae949ea6c3..d29a2840eb27 100644
--- a/app/scripts/controllers/metametrics-controller.ts
+++ b/app/scripts/controllers/metametrics-controller.ts
@@ -164,6 +164,9 @@ export type MetaMaskState = {
   security_providers: string[];
   addressBook: AddressBookControllerState['addressBook'];
   currentCurrency: string;
+  preferences: {
+    privacyMode: PreferencesControllerState['preferences']['privacyMode'];
+  };
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   custodyAccountDetails: {
     [address: string]: {
@@ -1228,6 +1231,8 @@ export default class MetaMetricsController extends BaseController<
         metamaskState.dataCollectionForMarketing,
       [MetaMetricsUserTrait.TokenSortPreference]:
         metamaskState.tokenSortConfig?.key || '',
+      [MetaMetricsUserTrait.PrivacyModeEnabled]:
+        metamaskState.preferences.privacyMode,
     };
 
     if (!previousUserTraits) {
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index a3a1f158886c..3f1941a5c00e 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -590,6 +590,10 @@ export enum MetaMetricsUserTrait {
    * Identified when the user changes token sort order on asset-list
    */
   TokenSortPreference = 'token_sort_preference',
+  /**
+   * Identifies if the Privacy Mode is enabled
+   */
+  PrivacyModeEnabled = 'privacy_mode_toggle',
 }
 
 /**

From 68ba6351f710a3a2a18332b075cd6b999baf09dd Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:09:18 +0100
Subject: [PATCH 072/111] test: [POM] Migrate reveal account srp e2e tests to
 use Page Object Model (#28354)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate e2e tests
`test/e2e/tests/settings/settings-security-reveal-srp.spec.js` to TS and
Page Object Model, to reduce flakiness.
- Create page classe for privacy and security settings page
- Put all settings related page classes in folder`
test/e2e/page-objects/pages/settings/`
- Deprecate/remove old functions in `helper.js`


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

## **Related issues**

Fixes: #28357

## **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/helpers.js                           |  22 +-
 test/e2e/page-objects/pages/error-page.ts     |   2 +-
 .../{ => settings}/experimental-settings.ts   |   8 +-
 .../pages/settings/privacy-settings.ts        | 201 ++++++++++++++++++
 .../pages/{ => settings}/settings-page.ts     |  27 ++-
 .../account/snap-account-settings.spec.ts     |   8 +-
 ...account-signatures-and-disconnects.spec.ts |   4 +-
 .../account/snap-account-signatures.spec.ts   |   8 +-
 .../metrics/developer-options-sentry.spec.ts  |   2 +-
 .../settings-security-reveal-srp.spec.js      | 129 -----------
 .../settings-security-reveal-srp.spec.ts      | 104 +++++++++
 11 files changed, 343 insertions(+), 172 deletions(-)
 rename test/e2e/page-objects/pages/{ => settings}/experimental-settings.ts (83%)
 create mode 100644 test/e2e/page-objects/pages/settings/privacy-settings.ts
 rename test/e2e/page-objects/pages/{ => settings}/settings-page.ts (66%)
 delete mode 100644 test/e2e/tests/settings/settings-security-reveal-srp.spec.js
 create mode 100644 test/e2e/tests/settings/settings-security-reveal-srp.spec.ts

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 1e03da918ed7..f4a5251b1ccf 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -636,11 +636,10 @@ const openSRPRevealQuiz = async (driver) => {
   await driver.clickElement('[data-testid="reveal-seed-words"]');
 };
 
-const passwordUnlockOpenSRPRevealQuiz = async (driver) => {
-  await unlockWallet(driver);
-  await openSRPRevealQuiz(driver);
-};
-
+/**
+ * @deprecated Please use page object functions in `test/e2e/page-objects/pages/settings/privacy-settings.ts`.
+ * @param driver
+ */
 const completeSRPRevealQuiz = async (driver) => {
   // start quiz
   await driver.clickElement('[data-testid="srp-quiz-get-started"]');
@@ -668,17 +667,6 @@ const tapAndHoldToRevealSRP = async (driver) => {
   );
 };
 
-const closeSRPReveal = async (driver) => {
-  await driver.clickElement({
-    text: tEn('close'),
-    tag: 'button',
-  });
-  await driver.findVisibleElement({
-    text: tEn('tokens'),
-    tag: 'button',
-  });
-};
-
 const DAPP_HOST_ADDRESS = '127.0.0.1:8080';
 const DAPP_URL = `http://${DAPP_HOST_ADDRESS}`;
 const DAPP_ONE_URL = 'http://127.0.0.1:8081';
@@ -1238,9 +1226,7 @@ module.exports = {
   completeCreateNewWalletOnboardingFlow,
   completeCreateNewWalletOnboardingFlowWithOptOut,
   openSRPRevealQuiz,
-  passwordUnlockOpenSRPRevealQuiz,
   completeSRPRevealQuiz,
-  closeSRPReveal,
   tapAndHoldToRevealSRP,
   createDownloadFolder,
   openDapp,
diff --git a/test/e2e/page-objects/pages/error-page.ts b/test/e2e/page-objects/pages/error-page.ts
index 76acacdcf9dd..17b3f6714186 100644
--- a/test/e2e/page-objects/pages/error-page.ts
+++ b/test/e2e/page-objects/pages/error-page.ts
@@ -1,6 +1,6 @@
 import { Driver } from '../../webdriver/driver';
 import HeaderNavbar from './header-navbar';
-import SettingsPage from './settings-page';
+import SettingsPage from './settings/settings-page';
 import DevelopOptionsPage from './developer-options-page';
 
 const FEEDBACK_MESSAGE =
diff --git a/test/e2e/page-objects/pages/experimental-settings.ts b/test/e2e/page-objects/pages/settings/experimental-settings.ts
similarity index 83%
rename from test/e2e/page-objects/pages/experimental-settings.ts
rename to test/e2e/page-objects/pages/settings/experimental-settings.ts
index 7cd780229acd..3af5c8a538e4 100644
--- a/test/e2e/page-objects/pages/experimental-settings.ts
+++ b/test/e2e/page-objects/pages/settings/experimental-settings.ts
@@ -1,18 +1,18 @@
-import { Driver } from '../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class ExperimentalSettings {
   private readonly driver: Driver;
 
   // Locators
-  private readonly addAccountSnapToggle: string =
+  private readonly addAccountSnapToggle =
     '[data-testid="add-account-snap-toggle-div"]';
 
-  private readonly experimentalPageTitle: object = {
+  private readonly experimentalPageTitle = {
     text: 'Experimental',
     tag: 'h4',
   };
 
-  private readonly redesignedSignatureToggle: string =
+  private readonly redesignedSignatureToggle =
     '[data-testid="toggle-redesigned-confirmations-container"]';
 
   constructor(driver: Driver) {
diff --git a/test/e2e/page-objects/pages/settings/privacy-settings.ts b/test/e2e/page-objects/pages/settings/privacy-settings.ts
new file mode 100644
index 000000000000..013ed65e4572
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/privacy-settings.ts
@@ -0,0 +1,201 @@
+import { Driver } from '../../../webdriver/driver';
+import { clickNestedButton } from '../../../helpers';
+import { tEn } from '../../../../lib/i18n-helpers';
+
+class PrivacySettings {
+  private readonly driver: Driver;
+
+  private readonly privacySettingsPageTitle = {
+    text: 'Security & privacy',
+    tag: 'h4',
+  };
+
+  // SRP related locators
+  private readonly closeRevealSrpDialogButton = {
+    text: tEn('close'),
+    tag: 'button',
+  };
+
+  private readonly copySrpButton = {
+    text: tEn('copyToClipboard'),
+    tag: 'button',
+  };
+
+  private readonly copiedSrpExclamation = {
+    text: tEn('copiedExclamation'),
+    tag: 'button',
+  };
+
+  private readonly displayedSrpText = '[data-testid="srp_text"]';
+
+  private readonly holdToRevealSRPButton = {
+    text: tEn('holdToRevealSRP'),
+    tag: 'span',
+  };
+
+  private readonly revealSrpButton = '[data-testid="reveal-seed-words"]';
+
+  private readonly revealSrpNextButton = {
+    text: 'Next',
+    tag: 'button',
+  };
+
+  private readonly revealSrpPasswordInput = '[data-testid="input-password"]';
+
+  private readonly revealSrpQrCodeImage = '[data-testid="qr-srp"]';
+
+  private readonly revealSrpQuizContinueButton =
+    '[data-testid="srp-quiz-continue"]';
+
+  private readonly revealSrpQuizGetStartedButton =
+    '[data-testid="srp-quiz-get-started"]';
+
+  private readonly revealSrpQuizModalTitle = {
+    text: 'Security quiz',
+    tag: 'header',
+  };
+
+  private readonly revealSrpQuizQuestionOne =
+    '[data-testid="srp_stage_question_one"]';
+
+  private readonly revealSrpQuizQuestionTwo =
+    '[data-testid="srp_stage_question_two"]';
+
+  private readonly revealSrpQuizRightAnswerButton =
+    '[data-testid="srp-quiz-right-answer"]';
+
+  private readonly revealSrpQuizTryAgainButton =
+    '[data-testid="srp-quiz-try-again"]';
+
+  private readonly revealSrpQuizWrongAnswerButton =
+    '[data-testid="srp-quiz-wrong-answer"]';
+
+  private readonly revealSrpQuizWrongAnswerMessageOne = {
+    text: 'Wrong! No one can help get your Secret Recovery Phrase back',
+    tag: 'p',
+  };
+
+  private readonly revealSrpQuizWrongAnswerMessageTwo = {
+    text: 'Nope! Never share your Secret Recovery Phrase with anyone, ever',
+    tag: 'p',
+  };
+
+  private readonly revealSrpWrongPasswordMessage = '.mm-help-text';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForSelector(this.privacySettingsPageTitle);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Privacy & Security Settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Privacy & Security Settings page is loaded');
+  }
+
+  async closeRevealSrpDialog(): Promise<void> {
+    console.log('Close reveal SRP dialog on privacy settings page');
+    await this.driver.clickElement(this.closeRevealSrpDialogButton);
+  }
+
+  /**
+   * Complete reveal SRP quiz to open reveal SRP dialog.
+   *
+   * @param checkErrorAnswer - Whether to check for error answers during answering the quiz.
+   */
+  async completeRevealSrpQuiz(checkErrorAnswer?: boolean): Promise<void> {
+    console.log('Complete reveal SRP quiz on privacy settings page');
+    await this.driver.clickElement(this.revealSrpQuizGetStartedButton);
+
+    // answer quiz question 1
+    if (checkErrorAnswer) {
+      await this.driver.waitForSelector(this.revealSrpQuizQuestionOne);
+      await this.driver.clickElement(this.revealSrpQuizWrongAnswerButton);
+      await this.driver.waitForSelector(
+        this.revealSrpQuizWrongAnswerMessageOne,
+      );
+      await this.driver.clickElement(this.revealSrpQuizTryAgainButton);
+    }
+    await this.driver.waitForSelector(this.revealSrpQuizQuestionOne);
+    await this.driver.clickElement(this.revealSrpQuizRightAnswerButton);
+    await this.driver.clickElement(this.revealSrpQuizContinueButton);
+
+    // answer quiz question 2
+    if (checkErrorAnswer) {
+      await this.driver.waitForSelector(this.revealSrpQuizQuestionTwo);
+      await this.driver.clickElement(this.revealSrpQuizWrongAnswerButton);
+      await this.driver.waitForSelector(
+        this.revealSrpQuizWrongAnswerMessageTwo,
+      );
+      await this.driver.clickElement(this.revealSrpQuizTryAgainButton);
+    }
+    await this.driver.waitForSelector(this.revealSrpQuizQuestionTwo);
+    await this.driver.clickElement(this.revealSrpQuizRightAnswerButton);
+    await this.driver.clickElement(this.revealSrpQuizContinueButton);
+  }
+
+  /**
+   * Fill the password input and click the next button to reveal the SRP.
+   *
+   * @param password - The password to fill in the input.
+   * @param expectedErrorMessage - Whether to expect an error message.
+   */
+  async fillPasswordToRevealSrp(
+    password: string,
+    expectedErrorMessage?: string,
+  ): Promise<void> {
+    console.log('Fill password to reveal SRP on privacy settings page');
+    await this.driver.fill(this.revealSrpPasswordInput, password);
+    await this.driver.clickElement(this.revealSrpNextButton);
+    if (expectedErrorMessage) {
+      await this.driver.waitForSelector({
+        css: this.revealSrpWrongPasswordMessage,
+        text: expectedErrorMessage,
+      });
+    } else {
+      await this.driver.holdMouseDownOnElement(
+        this.holdToRevealSRPButton,
+        3000,
+      );
+    }
+  }
+
+  async openRevealSrpQuiz(): Promise<void> {
+    console.log('Open reveal SRP quiz on privacy settings page');
+    await this.driver.clickElement(this.revealSrpButton);
+    await this.driver.waitForSelector(this.revealSrpQuizModalTitle);
+  }
+
+  async check_displayedSrpCanBeCopied(): Promise<void> {
+    console.log('Check displayed SRP on privacy settings page can be copied');
+    await this.driver.clickElement(this.copySrpButton);
+    await this.driver.waitForSelector(this.copiedSrpExclamation);
+  }
+
+  async check_srpQrCodeIsDisplayed(): Promise<void> {
+    console.log('Check SRP QR code is displayed on privacy settings page');
+    await clickNestedButton(this.driver, 'QR');
+    await this.driver.waitForSelector(this.revealSrpQrCodeImage);
+  }
+
+  /**
+   * Check that the SRP text is displayed.
+   *
+   * @param expectedSrpText - The expected SRP text.
+   */
+  async check_srpTextIsDisplayed(expectedSrpText: string): Promise<void> {
+    console.log('Check SRP text is displayed on privacy settings page');
+    await this.driver.waitForSelector({
+      css: this.displayedSrpText,
+      text: expectedSrpText,
+    });
+  }
+}
+
+export default PrivacySettings;
diff --git a/test/e2e/page-objects/pages/settings-page.ts b/test/e2e/page-objects/pages/settings/settings-page.ts
similarity index 66%
rename from test/e2e/page-objects/pages/settings-page.ts
rename to test/e2e/page-objects/pages/settings/settings-page.ts
index c029e34efc7e..24b3f2294085 100644
--- a/test/e2e/page-objects/pages/settings-page.ts
+++ b/test/e2e/page-objects/pages/settings/settings-page.ts
@@ -1,20 +1,24 @@
-import { Driver } from '../../webdriver/driver';
+import { Driver } from '../../../webdriver/driver';
 
 class SettingsPage {
   private readonly driver: Driver;
 
-  // Locators
-  private readonly experimentalSettingsButton: object = {
+  private readonly developerOptionsButton = {
+    text: 'Developer Options',
+    css: '.tab-bar__tab__content__title',
+  };
+
+  private readonly experimentalSettingsButton = {
     text: 'Experimental',
     css: '.tab-bar__tab__content__title',
   };
 
-  private readonly developerOptionsButton: object = {
-    text: 'Developer Options',
+  private readonly privacySettingsButton = {
+    text: 'Security & privacy',
     css: '.tab-bar__tab__content__title',
   };
 
-  private readonly settingsPageTitle: object = {
+  private readonly settingsPageTitle = {
     text: 'Settings',
     css: 'h3',
   };
@@ -33,14 +37,19 @@ class SettingsPage {
     console.log('Settings page is loaded');
   }
 
+  async goToDevelopOptionSettings(): Promise<void> {
+    console.log('Navigating to Develop options page');
+    await this.driver.clickElement(this.developerOptionsButton);
+  }
+
   async goToExperimentalSettings(): Promise<void> {
     console.log('Navigating to Experimental Settings page');
     await this.driver.clickElement(this.experimentalSettingsButton);
   }
 
-  async goToDevelopOptionSettings(): Promise<void> {
-    console.log('Navigating to Develop options page');
-    await this.driver.clickElement(this.developerOptionsButton);
+  async goToPrivacySettings(): Promise<void> {
+    console.log('Navigating to Privacy & Security Settings page');
+    await this.driver.clickElement(this.privacySettingsButton);
   }
 }
 
diff --git a/test/e2e/tests/account/snap-account-settings.spec.ts b/test/e2e/tests/account/snap-account-settings.spec.ts
index 1a0c761fb4df..d96b76b540ec 100644
--- a/test/e2e/tests/account/snap-account-settings.spec.ts
+++ b/test/e2e/tests/account/snap-account-settings.spec.ts
@@ -2,11 +2,11 @@ import { Suite } from 'mocha';
 import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { Driver } from '../../webdriver/driver';
-import SettingsPage from '../../page-objects/pages/settings-page';
-import ExperimentalSettings from '../../page-objects/pages/experimental-settings';
-import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import AccountListPage from '../../page-objects/pages/account-list-page';
+import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
+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('Add snap account experimental settings @no-mmi', function (this: Suite) {
   it('switch "Enable Add account snap" to on', async function () {
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 7398747671c7..7e355302212a 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
@@ -2,9 +2,9 @@ import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import { WINDOW_TITLES, withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
-import ExperimentalSettings from '../../page-objects/pages/experimental-settings';
+import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import SettingsPage from '../../page-objects/pages/settings-page';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
 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';
diff --git a/test/e2e/tests/account/snap-account-signatures.spec.ts b/test/e2e/tests/account/snap-account-signatures.spec.ts
index 0c528b1dc20c..e04987561fc5 100644
--- a/test/e2e/tests/account/snap-account-signatures.spec.ts
+++ b/test/e2e/tests/account/snap-account-signatures.spec.ts
@@ -1,9 +1,12 @@
 import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import { WINDOW_TITLES, withFixtures } from '../../helpers';
-import ExperimentalSettings from '../../page-objects/pages/experimental-settings';
 import FixtureBuilder from '../../fixture-builder';
+import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
+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';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import {
@@ -13,9 +16,6 @@ import {
   signTypedDataV4WithSnapAccount,
   signTypedDataWithSnapAccount,
 } from '../../page-objects/flows/sign.flow';
-import SettingsPage from '../../page-objects/pages/settings-page';
-import SnapSimpleKeyringPage from '../../page-objects/pages/snap-simple-keyring-page';
-import TestDapp from '../../page-objects/pages/test-dapp';
 
 describe('Snap Account Signatures @no-mmi', function (this: Suite) {
   this.timeout(200000); // This test is very long, so we need an unusually high timeout
diff --git a/test/e2e/tests/metrics/developer-options-sentry.spec.ts b/test/e2e/tests/metrics/developer-options-sentry.spec.ts
index 3c20f931f302..eaad1c4760e3 100644
--- a/test/e2e/tests/metrics/developer-options-sentry.spec.ts
+++ b/test/e2e/tests/metrics/developer-options-sentry.spec.ts
@@ -4,7 +4,7 @@ import { withFixtures, sentryRegEx } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { Driver } from '../../webdriver/driver';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import SettingsPage from '../../page-objects/pages/settings-page';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import DevelopOptions from '../../page-objects/pages/developer-options-page';
 import ErrorPage from '../../page-objects/pages/error-page';
diff --git a/test/e2e/tests/settings/settings-security-reveal-srp.spec.js b/test/e2e/tests/settings/settings-security-reveal-srp.spec.js
deleted file mode 100644
index 7f68f53f8dc7..000000000000
--- a/test/e2e/tests/settings/settings-security-reveal-srp.spec.js
+++ /dev/null
@@ -1,129 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  withFixtures,
-  passwordUnlockOpenSRPRevealQuiz,
-  completeSRPRevealQuiz,
-  tapAndHoldToRevealSRP,
-  closeSRPReveal,
-  clickNestedButton,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-const { tEn } = require('../../../lib/i18n-helpers');
-const { E2E_SRP } = require('../../default-fixture');
-
-describe('Reveal SRP through settings', function () {
-  const testPassword = 'correct horse battery staple';
-  const wrongTestPassword = 'test test test test';
-
-  it('should not reveal SRP text with incorrect password', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await passwordUnlockOpenSRPRevealQuiz(driver);
-        await completeSRPRevealQuiz(driver);
-        await driver.fill('#password-box', wrongTestPassword);
-        await driver.press('#password-box', driver.Key.ENTER);
-        const passwordErrorIsDisplayed = await driver.isElementPresent({
-          css: '.mm-help-text',
-          text: 'Incorrect password',
-        });
-        assert.equal(passwordErrorIsDisplayed, true);
-      },
-    );
-  });
-
-  it('completes quiz and reveals SRP text', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await passwordUnlockOpenSRPRevealQuiz(driver);
-        await completeSRPRevealQuiz(driver);
-
-        // enter password
-        await driver.fill('#password-box', testPassword);
-        await driver.press('#password-box', driver.Key.ENTER);
-
-        await tapAndHoldToRevealSRP(driver);
-
-        // confirm SRP text matches expected
-        await driver.waitForSelector({
-          css: '[data-testid="srp_text"]',
-          text: E2E_SRP,
-        });
-
-        // copy SRP text to clipboard
-        await driver.clickElement({
-          text: tEn('copyToClipboard'),
-          tag: 'button',
-        });
-        await driver.findVisibleElement({
-          text: tEn('copiedExclamation'),
-          tag: 'button',
-        });
-
-        // confirm that CTA returns user to wallet view
-        await closeSRPReveal(driver);
-      },
-    );
-  });
-
-  it('completes quiz and reveals SRP QR after wrong answers', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await passwordUnlockOpenSRPRevealQuiz(driver);
-
-        // start quiz
-        await driver.clickElement('[data-testid="srp-quiz-get-started"]');
-
-        // tap incorrect answer 1
-        await driver.clickElement('[data-testid="srp-quiz-wrong-answer"]');
-
-        // try again
-        await driver.clickElement('[data-testid="srp-quiz-try-again"]');
-
-        // tap correct answer 1
-        await driver.clickElement('[data-testid="srp-quiz-right-answer"]');
-
-        // tap Continue 1
-        await driver.clickElement('[data-testid="srp-quiz-continue"]');
-
-        // tap incorrect answer 2
-        await driver.clickElement('[data-testid="srp-quiz-wrong-answer"]');
-
-        // try again
-        await driver.clickElement('[data-testid="srp-quiz-try-again"]');
-
-        // tap correct answer 1
-        await driver.clickElement('[data-testid="srp-quiz-right-answer"]');
-
-        // tap Continue 2
-        await driver.clickElement('[data-testid="srp-quiz-continue"]');
-
-        // enter password
-        await driver.fill('#password-box', testPassword);
-        await driver.press('#password-box', driver.Key.ENTER);
-
-        // tap and hold to reveal
-        await tapAndHoldToRevealSRP(driver);
-
-        // confirm SRP QR is displayed
-        await clickNestedButton(driver, 'QR');
-        const qrCode = await driver.findElement('[data-testid="qr-srp"]');
-        assert.equal(await qrCode.isDisplayed(), true);
-
-        // confirm that CTA returns user to wallet view
-        await closeSRPReveal(driver);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
new file mode 100644
index 000000000000..35ff25344789
--- /dev/null
+++ b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
@@ -0,0 +1,104 @@
+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 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';
+
+describe('Reveal SRP through settings', function () {
+  const testPassword = 'correct horse battery staple';
+  const wrongTestPassword = 'test test test test';
+
+  it('should not reveal SRP text with incorrect password', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        // navigate to security & privacy settings
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+        await privacySettings.openRevealSrpQuiz();
+        await privacySettings.completeRevealSrpQuiz(true);
+        await privacySettings.fillPasswordToRevealSrp(
+          wrongTestPassword,
+          'Incorrect password',
+        );
+      },
+    );
+  });
+
+  it('completes quiz and reveals SRP text', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        // navigate to security & privacy settings
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+
+        // fill password to reveal SRP and check the displayed SRP
+        await privacySettings.openRevealSrpQuiz();
+        await privacySettings.completeRevealSrpQuiz(true);
+        await privacySettings.fillPasswordToRevealSrp(testPassword);
+        await privacySettings.check_srpTextIsDisplayed(E2E_SRP);
+        await privacySettings.check_displayedSrpCanBeCopied();
+
+        // check that closing the reveal SRP dialog navigates user back to wallet view
+        await privacySettings.closeRevealSrpDialog();
+        await new HomePage(driver).check_pageIsLoaded();
+      },
+    );
+  });
+
+  it('completes quiz and reveals SRP QR after wrong answers in quiz', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        // Navigate to security & privacy settings
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+
+        // fill password to reveal SRP and check the displayed SRP QR code
+        await privacySettings.openRevealSrpQuiz();
+        await privacySettings.completeRevealSrpQuiz(true);
+        await privacySettings.fillPasswordToRevealSrp(testPassword);
+        await privacySettings.check_srpTextIsDisplayed(E2E_SRP);
+        await privacySettings.check_srpQrCodeIsDisplayed();
+
+        // check that closing the reveal SRP dialog navigates user back to wallet view
+        await privacySettings.closeRevealSrpDialog();
+        await new HomePage(driver).check_pageIsLoaded();
+      },
+    );
+  });
+});

From e54f555a0650238501640e750c7081f11008df4b Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Tue, 12 Nov 2024 12:00:31 +0000
Subject: [PATCH 073/111] fix: get `supportedChains` to avoid blocking the
 confirmation process (#28313)
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 the blocking behaviour in the confirmation process
caused by the synchronous `supportedChains` check. Previously, the Send
flow was halted until a response from the
`security-alerts.api.cx.metamask.io` API was received. This created
delays and negatively impacted the user experience, especially when the
API response was slow.

**Key Changes:**
**Asynchronous Chain Validation:** The `supportedChains` check is now
performed asynchronously within the non-awaited
`validateRequestWithPPOM` function. This ensures that the Send flow is
not blocked while waiting for the API response.
**Introduction of CheckingChain Result Type:** A new result type,
`CheckingChain`, is introduced to represent the intermediate state
before a definitive result is obtained. This state is used before the
`loading` status in both middleware and transaction utility functions.

<!--
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/28313?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Use a proxy to intercept requests
2. Start a Send flow
3. Intercept the request to `security-alerts.api.cx.metamask.io`
4. See send flow cannot be initiated until we have a response to this
request

## **Screenshots/Recordings**


[supported-chains-.webm](https://github.com/user-attachments/assets/4e9e495a-10f3-4bb1-8d05-8045a735b655)


[unsupported-chains.webm](https://github.com/user-attachments/assets/e5767bc1-2eab-44bd-83c3-777d34c23ff6)

<!-- 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-middleware.test.ts  |  78 +----------
 app/scripts/lib/ppom/ppom-middleware.ts       |  30 ++---
 app/scripts/lib/ppom/ppom-util.test.ts        | 121 ++++++++++++------
 app/scripts/lib/ppom/ppom-util.ts             |  49 +++++--
 app/scripts/lib/ppom/types.ts                 |   6 +
 app/scripts/lib/transaction/util.test.ts      |  58 +--------
 app/scripts/lib/transaction/util.ts           |  35 ++---
 shared/constants/security-provider.ts         |  15 ++-
 .../signatures/malicious-signatures.spec.ts   |   8 ++
 .../signatures/signature-helpers.ts           |  68 ++++++++--
 .../confirmations/signatures/siwe.spec.ts     |   8 ++
 .../tests/metrics/signature-approved.spec.js  |  88 +++++--------
 12 files changed, 271 insertions(+), 293 deletions(-)

diff --git a/app/scripts/lib/ppom/ppom-middleware.test.ts b/app/scripts/lib/ppom/ppom-middleware.test.ts
index 8977c00aa3d7..16317fef0380 100644
--- a/app/scripts/lib/ppom/ppom-middleware.test.ts
+++ b/app/scripts/lib/ppom/ppom-middleware.test.ts
@@ -7,7 +7,6 @@ import {
   BlockaidReason,
   BlockaidResultType,
 } from '../../../../shared/constants/security-provider';
-import { flushPromises } from '../../../../test/lib/timer-helpers';
 import { mockNetworkState } from '../../../../test/stub/networks';
 import { createPPOMMiddleware, PPOMMiddlewareRequest } from './ppom-middleware';
 import {
@@ -105,7 +104,6 @@ const createMiddleware = (
 };
 
 describe('PPOMMiddleware', () => {
-  const validateRequestWithPPOMMock = jest.mocked(validateRequestWithPPOM);
   const generateSecurityAlertIdMock = jest.mocked(generateSecurityAlertId);
   const handlePPOMErrorMock = jest.mocked(handlePPOMError);
   const isChainSupportedMock = jest.mocked(isChainSupported);
@@ -114,7 +112,6 @@ describe('PPOMMiddleware', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    validateRequestWithPPOMMock.mockResolvedValue(SECURITY_ALERT_RESPONSE_MOCK);
     generateSecurityAlertIdMock.mockReturnValue(SECURITY_ALERT_ID_MOCK);
     handlePPOMErrorMock.mockReturnValue(SECURITY_ALERT_RESPONSE_MOCK);
     isChainSupportedMock.mockResolvedValue(true);
@@ -129,38 +126,13 @@ describe('PPOMMiddleware', () => {
     };
   });
 
-  it('updates alert response after validating request', async () => {
+  it('adds checking chain response to confirmation requests while validation is in progress', async () => {
     const updateSecurityAlertResponse = jest.fn();
 
     const middlewareFunction = createMiddleware({
       updateSecurityAlertResponse,
     });
 
-    const req = {
-      ...REQUEST_MOCK,
-      method: 'eth_sendTransaction',
-      securityAlertResponse: undefined,
-    };
-
-    await middlewareFunction(
-      req,
-      { ...JsonRpcResponseStruct.TYPE },
-      () => undefined,
-    );
-
-    await flushPromises();
-
-    expect(updateSecurityAlertResponse).toHaveBeenCalledTimes(1);
-    expect(updateSecurityAlertResponse).toHaveBeenCalledWith(
-      req.method,
-      SECURITY_ALERT_ID_MOCK,
-      SECURITY_ALERT_RESPONSE_MOCK,
-    );
-  });
-
-  it('adds loading response to confirmation requests while validation is in progress', async () => {
-    const middlewareFunction = createMiddleware();
-
     const req: PPOMMiddlewareRequest<(string | { to: string })[]> = {
       ...REQUEST_MOCK,
       method: 'eth_sendTransaction',
@@ -173,7 +145,9 @@ describe('PPOMMiddleware', () => {
       () => undefined,
     );
 
-    expect(req.securityAlertResponse?.reason).toBe(BlockaidReason.inProgress);
+    expect(req.securityAlertResponse?.reason).toBe(
+      BlockaidReason.checkingChain,
+    );
     expect(req.securityAlertResponse?.result_type).toBe(
       BlockaidResultType.Loading,
     );
@@ -197,50 +171,6 @@ describe('PPOMMiddleware', () => {
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
-  it('does not do validation if unable to get the chainId from the network provider config', async () => {
-    isChainSupportedMock.mockResolvedValue(false);
-    const middlewareFunction = createMiddleware({
-      chainId: null,
-    });
-
-    const req = {
-      ...REQUEST_MOCK,
-      method: 'eth_sendTransaction',
-      securityAlertResponse: undefined,
-    };
-
-    await middlewareFunction(
-      req,
-      { ...JsonRpcResponseStruct.TYPE },
-      () => undefined,
-    );
-
-    expect(req.securityAlertResponse).toBeUndefined();
-    expect(validateRequestWithPPOM).not.toHaveBeenCalled();
-  });
-
-  it('does not do validation if user is not on a supported network', async () => {
-    isChainSupportedMock.mockResolvedValue(false);
-    const middlewareFunction = createMiddleware({
-      chainId: '0x2',
-    });
-
-    const req = {
-      ...REQUEST_MOCK,
-      method: 'eth_sendTransaction',
-      securityAlertResponse: undefined,
-    };
-
-    await middlewareFunction(
-      req,
-      { ...JsonRpcResponseStruct.TYPE },
-      () => undefined,
-    );
-
-    expect(req.securityAlertResponse).toBeUndefined();
-    expect(validateRequestWithPPOM).not.toHaveBeenCalled();
-  });
-
   it('does not do validation when request is not for confirmation method', async () => {
     const middlewareFunction = createMiddleware();
 
diff --git a/app/scripts/lib/ppom/ppom-middleware.ts b/app/scripts/lib/ppom/ppom-middleware.ts
index ebfdbe3f04d7..44c7a8a965c4 100644
--- a/app/scripts/lib/ppom/ppom-middleware.ts
+++ b/app/scripts/lib/ppom/ppom-middleware.ts
@@ -13,17 +13,16 @@ import { MESSAGE_TYPE } from '../../../../shared/constants/app';
 import { SIGNING_METHODS } from '../../../../shared/constants/transaction';
 import { PreferencesController } from '../../controllers/preferences-controller';
 import { AppStateController } from '../../controllers/app-state-controller';
-import { LOADING_SECURITY_ALERT_RESPONSE } from '../../../../shared/constants/security-provider';
+import { SECURITY_ALERT_RESPONSE_CHECKING_CHAIN } from '../../../../shared/constants/security-provider';
 // eslint-disable-next-line import/no-restricted-paths
 import { getProviderConfig } from '../../../../ui/ducks/metamask/metamask';
 import { trace, TraceContext, TraceName } from '../../../../shared/lib/trace';
 import {
   generateSecurityAlertId,
   handlePPOMError,
-  isChainSupported,
   validateRequestWithPPOM,
 } from './ppom-util';
-import { SecurityAlertResponse } from './types';
+import { SecurityAlertResponse, UpdateSecurityAlertResponse } from './types';
 
 const CONFIRMATION_METHODS = Object.freeze([
   'eth_sendRawTransaction',
@@ -64,11 +63,7 @@ export function createPPOMMiddleware<
   networkController: NetworkController,
   appStateController: AppStateController,
   accountsController: AccountsController,
-  updateSecurityAlertResponse: (
-    method: string,
-    signatureAlertId: string,
-    securityAlertResponse: SecurityAlertResponse,
-  ) => void,
+  updateSecurityAlertResponse: UpdateSecurityAlertResponse,
 ) {
   return async (
     req: PPOMMiddlewareRequest<Params>,
@@ -88,9 +83,7 @@ export function createPPOMMiddleware<
 
       if (
         !securityAlertsEnabled ||
-        !CONFIRMATION_METHODS.includes(req.method) ||
-        // Do not move this call above this check because it will result in unnecessary calls
-        !(await isChainSupported(chainId))
+        !CONFIRMATION_METHODS.includes(req.method)
       ) {
         return;
       }
@@ -122,27 +115,22 @@ export function createPPOMMiddleware<
             request: req,
             securityAlertId,
             chainId,
-          }).then((securityAlertResponse) => {
-            updateSecurityAlertResponse(
-              req.method,
-              securityAlertId,
-              securityAlertResponse,
-            );
+            updateSecurityAlertResponse,
           }),
       );
 
-      const loadingSecurityAlertResponse: SecurityAlertResponse = {
-        ...LOADING_SECURITY_ALERT_RESPONSE,
+      const securityAlertResponseCheckingChain: SecurityAlertResponse = {
+        ...SECURITY_ALERT_RESPONSE_CHECKING_CHAIN,
         securityAlertId,
       };
 
       if (SIGNING_METHODS.includes(req.method)) {
         appStateController.addSignatureSecurityAlertResponse(
-          loadingSecurityAlertResponse,
+          securityAlertResponseCheckingChain,
         );
       }
 
-      req.securityAlertResponse = loadingSecurityAlertResponse;
+      req.securityAlertResponse = securityAlertResponseCheckingChain;
     } catch (error) {
       req.securityAlertResponse = handlePPOMError(
         error,
diff --git a/app/scripts/lib/ppom/ppom-util.test.ts b/app/scripts/lib/ppom/ppom-util.test.ts
index ea62c3b88533..8acb6dd9788c 100644
--- a/app/scripts/lib/ppom/ppom-util.test.ts
+++ b/app/scripts/lib/ppom/ppom-util.test.ts
@@ -10,9 +10,12 @@ import {
   SignatureController,
   SignatureRequest,
 } from '@metamask/signature-controller';
+import { Hex } from '@metamask/utils';
 import {
   BlockaidReason,
   BlockaidResultType,
+  LOADING_SECURITY_ALERT_RESPONSE,
+  SECURITY_ALERT_RESPONSE_CHAIN_NOT_SUPPORTED,
   SecurityAlertSource,
 } from '../../../../shared/constants/security-provider';
 import { AppStateController } from '../../controllers/app-state-controller';
@@ -32,7 +35,7 @@ jest.mock('@metamask/transaction-controller', () => ({
 
 const SECURITY_ALERT_ID_MOCK = '1234-5678';
 const TRANSACTION_ID_MOCK = '123';
-const CHAIN_ID_MOCK = '0x1';
+const CHAIN_ID_MOCK = '0x1' as Hex;
 
 const REQUEST_MOCK = {
   method: 'eth_signTypedData_v4',
@@ -45,6 +48,7 @@ const SECURITY_ALERT_RESPONSE_MOCK: SecurityAlertResponse = {
   result_type: 'success',
   reason: 'success',
   source: SecurityAlertSource.Local,
+  securityAlertId: SECURITY_ALERT_ID_MOCK,
 };
 
 const TRANSACTION_PARAMS_MOCK_1: TransactionParams = {
@@ -110,6 +114,15 @@ describe('PPOM Utils', () => {
   );
   let isSecurityAlertsEnabledMock: jest.SpyInstance;
 
+  const updateSecurityAlertResponseMock = jest.fn();
+
+  const validateRequestWithPPOMOptionsBase = {
+    request: REQUEST_MOCK,
+    securityAlertId: SECURITY_ALERT_ID_MOCK,
+    chainId: CHAIN_ID_MOCK,
+    updateSecurityAlertResponse: updateSecurityAlertResponseMock,
+  };
+
   beforeEach(() => {
     jest.resetAllMocks();
     jest.spyOn(console, 'error').mockImplementation(() => undefined);
@@ -119,7 +132,7 @@ describe('PPOM Utils', () => {
   });
 
   describe('validateRequestWithPPOM', () => {
-    it('returns response from validation with PPOM instance via controller', async () => {
+    it('updates response from validation with PPOM instance via controller', async () => {
       const ppom = createPPOMMock();
       const ppomController = createPPOMControllerMock();
 
@@ -129,23 +142,39 @@ describe('PPOM Utils', () => {
         (callback) => callback(ppom as any) as any,
       );
 
-      const response = await validateRequestWithPPOM({
+      await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
-        request: REQUEST_MOCK,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
-      });
-
-      expect(response).toStrictEqual({
-        ...SECURITY_ALERT_RESPONSE_MOCK,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
       });
+      expect(updateSecurityAlertResponseMock).toHaveBeenCalledWith(
+        REQUEST_MOCK.method,
+        SECURITY_ALERT_ID_MOCK,
+        {
+          ...SECURITY_ALERT_RESPONSE_MOCK,
+          securityAlertId: SECURITY_ALERT_ID_MOCK,
+        },
+      );
 
       expect(ppom.validateJsonRpc).toHaveBeenCalledTimes(1);
       expect(ppom.validateJsonRpc).toHaveBeenCalledWith(REQUEST_MOCK);
     });
 
-    it('returns error response if validation with PPOM instance throws', async () => {
+    it('updates securityAlertResponse with loading state', async () => {
+      const ppomController = createPPOMControllerMock();
+
+      await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
+        ppomController,
+      });
+
+      expect(updateSecurityAlertResponseMock).toHaveBeenCalledWith(
+        REQUEST_MOCK.method,
+        SECURITY_ALERT_ID_MOCK,
+        LOADING_SECURITY_ALERT_RESPONSE,
+      );
+    });
+
+    it('updates error response if validation with PPOM instance throws', async () => {
       const ppom = createPPOMMock();
       const ppomController = createPPOMControllerMock();
 
@@ -157,37 +186,41 @@ describe('PPOM Utils', () => {
           callback(ppom as any) as any,
       );
 
-      const response = await validateRequestWithPPOM({
+      await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
-        request: REQUEST_MOCK,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
       });
 
-      expect(response).toStrictEqual({
-        result_type: BlockaidResultType.Errored,
-        reason: BlockaidReason.errored,
-        description: 'Test Error: Test error message',
-      });
+      expect(updateSecurityAlertResponseMock).toHaveBeenCalledWith(
+        validateRequestWithPPOMOptionsBase.request.method,
+        SECURITY_ALERT_ID_MOCK,
+        {
+          result_type: BlockaidResultType.Errored,
+          reason: BlockaidReason.errored,
+          description: 'Test Error: Test error message',
+        },
+      );
     });
 
-    it('returns error response if controller throws', async () => {
+    it('updates error response if controller throws', async () => {
       const ppomController = createPPOMControllerMock();
 
       ppomController.usePPOM.mockRejectedValue(createErrorMock());
 
-      const response = await validateRequestWithPPOM({
+      await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
-        request: REQUEST_MOCK,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
       });
 
-      expect(response).toStrictEqual({
-        result_type: BlockaidResultType.Errored,
-        reason: BlockaidReason.errored,
-        description: 'Test Error: Test error message',
-      });
+      expect(updateSecurityAlertResponseMock).toHaveBeenCalledWith(
+        validateRequestWithPPOMOptionsBase.request.method,
+        SECURITY_ALERT_ID_MOCK,
+        {
+          result_type: BlockaidResultType.Errored,
+          reason: BlockaidReason.errored,
+          description: 'Test Error: Test error message',
+        },
+      );
     });
 
     it('normalizes request if method is eth_sendTransaction', async () => {
@@ -209,10 +242,9 @@ describe('PPOM Utils', () => {
       };
 
       await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
         request,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
       });
 
       expect(ppom.validateJsonRpc).toHaveBeenCalledTimes(1);
@@ -226,6 +258,23 @@ describe('PPOM Utils', () => {
         TRANSACTION_PARAMS_MOCK_1,
       );
     });
+
+    it('updates response indicating chain is not supported', async () => {
+      const ppomController = {} as PPOMController;
+      const CHAIN_ID_UNSUPPORTED_MOCK = '0x2';
+
+      await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
+        ppomController,
+        chainId: CHAIN_ID_UNSUPPORTED_MOCK,
+      });
+
+      expect(updateSecurityAlertResponseMock).toHaveBeenCalledWith(
+        validateRequestWithPPOMOptionsBase.request.method,
+        SECURITY_ALERT_ID_MOCK,
+        SECURITY_ALERT_RESPONSE_CHAIN_NOT_SUPPORTED,
+      );
+    });
   });
 
   describe('generateSecurityAlertId', () => {
@@ -318,10 +367,9 @@ describe('PPOM Utils', () => {
       const ppomController = createPPOMControllerMock();
 
       await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
         request,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
       });
 
       expect(ppomController.usePPOM).not.toHaveBeenCalled();
@@ -345,10 +393,9 @@ describe('PPOM Utils', () => {
         .mockRejectedValue(new Error('Test Error'));
 
       await validateRequestWithPPOM({
+        ...validateRequestWithPPOMOptionsBase,
         ppomController,
         request,
-        securityAlertId: SECURITY_ALERT_ID_MOCK,
-        chainId: CHAIN_ID_MOCK,
       });
 
       expect(ppomController.usePPOM).toHaveBeenCalledTimes(1);
diff --git a/app/scripts/lib/ppom/ppom-util.ts b/app/scripts/lib/ppom/ppom-util.ts
index e8c54ee5eb53..b0bf6b03b4d9 100644
--- a/app/scripts/lib/ppom/ppom-util.ts
+++ b/app/scripts/lib/ppom/ppom-util.ts
@@ -11,12 +11,14 @@ import { SignatureController } from '@metamask/signature-controller';
 import {
   BlockaidReason,
   BlockaidResultType,
+  LOADING_SECURITY_ALERT_RESPONSE,
+  SECURITY_ALERT_RESPONSE_CHAIN_NOT_SUPPORTED,
   SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST,
   SecurityAlertSource,
 } from '../../../../shared/constants/security-provider';
 import { SIGNING_METHODS } from '../../../../shared/constants/transaction';
 import { AppStateController } from '../../controllers/app-state-controller';
-import { SecurityAlertResponse } from './types';
+import { SecurityAlertResponse, UpdateSecurityAlertResponse } from './types';
 import {
   getSecurityAlertsAPISupportedChainIds,
   isSecurityAlertsAPIEnabled,
@@ -37,18 +39,36 @@ type PPOMRequest = Omit<JsonRpcRequest, 'method' | 'params'> & {
   method: typeof METHOD_SEND_TRANSACTION;
   params: [TransactionParams];
 };
+
 export async function validateRequestWithPPOM({
   ppomController,
   request,
   securityAlertId,
   chainId,
+  updateSecurityAlertResponse: updateSecurityResponse,
 }: {
   ppomController: PPOMController;
   request: JsonRpcRequest;
   securityAlertId: string;
   chainId: Hex;
-}): Promise<SecurityAlertResponse> {
+  updateSecurityAlertResponse: UpdateSecurityAlertResponse;
+}) {
   try {
+    if (!(await isChainSupported(chainId))) {
+      await updateSecurityResponse(
+        request.method,
+        securityAlertId,
+        SECURITY_ALERT_RESPONSE_CHAIN_NOT_SUPPORTED,
+      );
+      return;
+    }
+
+    await updateSecurityResponse(
+      request.method,
+      securityAlertId,
+      LOADING_SECURITY_ALERT_RESPONSE,
+    );
+
     const normalizedRequest = normalizePPOMRequest(request);
 
     const ppomResponse = isSecurityAlertsAPIEnabled()
@@ -58,13 +78,13 @@ export async function validateRequestWithPPOM({
           normalizedRequest,
           chainId,
         );
-
-    return {
-      ...ppomResponse,
-      securityAlertId,
-    };
+    await updateSecurityResponse(request.method, securityAlertId, ppomResponse);
   } catch (error: unknown) {
-    return handlePPOMError(error, 'Error validating JSON RPC using PPOM: ');
+    await updateSecurityResponse(
+      request.method,
+      securityAlertId,
+      handlePPOMError(error, 'Error validating JSON RPC using PPOM: '),
+    );
   }
 }
 
@@ -97,12 +117,15 @@ export async function updateSecurityAlertResponse({
   );
 
   if (isSignatureRequest) {
-    appStateController.addSignatureSecurityAlertResponse(securityAlertResponse);
+    appStateController.addSignatureSecurityAlertResponse({
+      ...securityAlertResponse,
+      securityAlertId,
+    });
   } else {
-    transactionController.updateSecurityAlertResponse(
-      confirmation.id,
-      securityAlertResponse,
-    );
+    transactionController.updateSecurityAlertResponse(confirmation.id, {
+      ...securityAlertResponse,
+      securityAlertId,
+    } as SecurityAlertResponse);
   }
 }
 
diff --git a/app/scripts/lib/ppom/types.ts b/app/scripts/lib/ppom/types.ts
index 6188d644aa12..57dd4a9e533d 100644
--- a/app/scripts/lib/ppom/types.ts
+++ b/app/scripts/lib/ppom/types.ts
@@ -10,3 +10,9 @@ export type SecurityAlertResponse = {
   securityAlertId?: string;
   source?: SecurityAlertSource;
 };
+
+export type UpdateSecurityAlertResponse = (
+  method: string,
+  securityAlertId: string,
+  securityAlertResponse: SecurityAlertResponse,
+) => Promise<void>;
diff --git a/app/scripts/lib/transaction/util.test.ts b/app/scripts/lib/transaction/util.test.ts
index 16077e0f08ed..fbbee025381b 100644
--- a/app/scripts/lib/transaction/util.test.ts
+++ b/app/scripts/lib/transaction/util.test.ts
@@ -16,7 +16,6 @@ import {
   BlockaidReason,
   BlockaidResultType,
 } from '../../../../shared/constants/security-provider';
-import { SecurityAlertResponse } from '../ppom/types';
 import { flushPromises } from '../../../../test/lib/timer-helpers';
 import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import {
@@ -79,11 +78,6 @@ const TRANSACTION_REQUEST_MOCK: AddTransactionRequest = {
   internalAccounts: [],
 } as unknown as AddTransactionRequest;
 
-const SECURITY_ALERT_RESPONSE_MOCK: SecurityAlertResponse = {
-  result_type: BlockaidResultType.Malicious,
-  reason: BlockaidReason.maliciousDomain,
-};
-
 function createTransactionControllerMock() {
   return {
     addTransaction: jest.fn(),
@@ -406,10 +400,6 @@ describe('Transaction Utils', () => {
 
     describe('validates using security provider', () => {
       it('adds loading response to request options', async () => {
-        validateRequestWithPPOMMock.mockResolvedValue(
-          SECURITY_ALERT_RESPONSE_MOCK,
-        );
-
         await addTransaction({
           ...request,
           securityAlertsEnabled: true,
@@ -425,36 +415,13 @@ describe('Transaction Utils', () => {
         ).toHaveBeenCalledWith(TRANSACTION_PARAMS_MOCK, {
           ...TRANSACTION_OPTIONS_MOCK,
           securityAlertResponse: {
-            reason: BlockaidReason.inProgress,
+            reason: BlockaidReason.checkingChain,
             result_type: BlockaidResultType.Loading,
             securityAlertId: SECURITY_ALERT_ID_MOCK,
           },
         });
       });
 
-      it('updates response after validation', async () => {
-        validateRequestWithPPOMMock.mockResolvedValue(
-          SECURITY_ALERT_RESPONSE_MOCK,
-        );
-
-        await addTransaction({
-          ...request,
-          securityAlertsEnabled: true,
-          chainId: '0x1',
-        });
-
-        await flushPromises();
-
-        expect(request.updateSecurityAlertResponse).toHaveBeenCalledTimes(1);
-        expect(request.updateSecurityAlertResponse).toHaveBeenCalledWith(
-          'eth_sendTransaction',
-          SECURITY_ALERT_ID_MOCK,
-          SECURITY_ALERT_RESPONSE_MOCK,
-        );
-
-        expect(validateRequestWithPPOMMock).toHaveBeenCalledTimes(1);
-      });
-
       it('unless blockaid is disabled', async () => {
         await addTransaction({
           ...request,
@@ -505,29 +472,6 @@ describe('Transaction Utils', () => {
         expect(validateRequestWithPPOMMock).toHaveBeenCalledTimes(0);
       });
 
-      it('unless chain is not supported', async () => {
-        isChainSupportedMock.mockResolvedValue(false);
-
-        await addTransaction({
-          ...request,
-          securityAlertsEnabled: true,
-          chainId: '0xF',
-        });
-
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledTimes(1);
-
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledWith(
-          TRANSACTION_PARAMS_MOCK,
-          TRANSACTION_OPTIONS_MOCK,
-        );
-
-        expect(validateRequestWithPPOMMock).toHaveBeenCalledTimes(0);
-      });
-
       it('unless transaction type is swap', async () => {
         const swapRequest = { ...request };
         swapRequest.transactionOptions.type = TransactionType.swap;
diff --git a/app/scripts/lib/transaction/util.ts b/app/scripts/lib/transaction/util.ts
index 8b71e33119f8..0bbf93afd8a8 100644
--- a/app/scripts/lib/transaction/util.ts
+++ b/app/scripts/lib/transaction/util.ts
@@ -16,12 +16,14 @@ import { PPOMController } from '@metamask/ppom-validator';
 import {
   generateSecurityAlertId,
   handlePPOMError,
-  isChainSupported,
   validateRequestWithPPOM,
 } from '../ppom/ppom-util';
-import { SecurityAlertResponse } from '../ppom/types';
 import {
-  LOADING_SECURITY_ALERT_RESPONSE,
+  SecurityAlertResponse,
+  UpdateSecurityAlertResponse,
+} from '../ppom/types';
+import {
+  SECURITY_ALERT_RESPONSE_CHECKING_CHAIN,
   SECURITY_PROVIDER_EXCLUDED_TRANSACTION_TYPES,
 } from '../../../../shared/constants/security-provider';
 import { endTrace, TraceName } from '../../../../shared/lib/trace';
@@ -38,11 +40,7 @@ type BaseAddTransactionRequest = {
   selectedAccount: InternalAccount;
   transactionParams: TransactionParams;
   transactionController: TransactionController;
-  updateSecurityAlertResponse: (
-    method: string,
-    securityAlertId: string,
-    securityAlertResponse: SecurityAlertResponse,
-  ) => void;
+  updateSecurityAlertResponse: UpdateSecurityAlertResponse;
   userOperationController: UserOperationController;
   internalAccounts: InternalAccount[];
 };
@@ -239,18 +237,12 @@ async function validateSecurity(request: AddTransactionRequest) {
 
   const { type } = transactionOptions;
 
-  const isCurrentChainSupported = await isChainSupported(chainId);
-
   const typeIsExcludedFromPPOM =
     SECURITY_PROVIDER_EXCLUDED_TRANSACTION_TYPES.includes(
       type as TransactionType,
     );
 
-  if (
-    !securityAlertsEnabled ||
-    !isCurrentChainSupported ||
-    typeIsExcludedFromPPOM
-  ) {
+  if (!securityAlertsEnabled || typeIsExcludedFromPPOM) {
     return;
   }
 
@@ -290,21 +282,16 @@ async function validateSecurity(request: AddTransactionRequest) {
       request: ppomRequest,
       securityAlertId,
       chainId,
-    }).then((securityAlertResponse) => {
-      updateSecurityAlertResponse(
-        ppomRequest.method,
-        securityAlertId,
-        securityAlertResponse,
-      );
+      updateSecurityAlertResponse,
     });
 
-    const loadingSecurityAlertResponse: SecurityAlertResponse = {
-      ...LOADING_SECURITY_ALERT_RESPONSE,
+    const securityAlertResponseCheckingChain: SecurityAlertResponse = {
+      ...SECURITY_ALERT_RESPONSE_CHECKING_CHAIN,
       securityAlertId,
     };
 
     request.transactionOptions.securityAlertResponse =
-      loadingSecurityAlertResponse;
+      securityAlertResponseCheckingChain;
   } catch (error) {
     handlePPOMError(error, 'Error validating JSON RPC using PPOM: ');
   }
diff --git a/shared/constants/security-provider.ts b/shared/constants/security-provider.ts
index 082f68aa88de..c7c4a8df3b2c 100644
--- a/shared/constants/security-provider.ts
+++ b/shared/constants/security-provider.ts
@@ -32,7 +32,7 @@ export enum BlockaidReason {
   approvalFarming = 'approval_farming',
   /** Malicious signature on Blur order  */
   blurFarming = 'blur_farming',
-  /** A known malicous site invoked that transaction  */
+  /** A known malicious site invoked that transaction  */
   maliciousDomain = 'malicious_domain',
   /** Malicious signature on a Permit order  */
   permitFarming = 'permit_farming',
@@ -57,6 +57,8 @@ export enum BlockaidReason {
   errored = 'Error',
   notApplicable = 'NotApplicable',
   inProgress = 'validation_in_progress',
+  checkingChain = 'CheckingChain',
+  chainNotSupported = 'ChainNotSupported',
 }
 
 export enum BlockaidResultType {
@@ -117,6 +119,17 @@ export const LOADING_SECURITY_ALERT_RESPONSE: SecurityAlertResponse = {
   reason: BlockaidReason.inProgress,
 };
 
+export const SECURITY_ALERT_RESPONSE_CHECKING_CHAIN: SecurityAlertResponse = {
+  result_type: BlockaidResultType.Loading,
+  reason: BlockaidReason.checkingChain,
+};
+
+export const SECURITY_ALERT_RESPONSE_CHAIN_NOT_SUPPORTED: SecurityAlertResponse =
+  {
+    result_type: BlockaidResultType.Benign,
+    reason: BlockaidReason.chainNotSupported,
+  };
+
 export enum SecurityAlertSource {
   /** Validation performed remotely using the Security Alerts API. */
   API = 'api',
diff --git a/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts b/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts
index fc8a6d0ab240..328ad7811e1b 100644
--- a/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts
@@ -10,6 +10,10 @@ import {
   withRedesignConfirmationFixtures,
 } from '../helpers';
 import { TestSuiteArguments } from '../transactions/shared';
+import {
+  BlockaidReason,
+  BlockaidResultType,
+} from '../../../../../shared/constants/security-provider';
 import {
   assertSignatureRejectedMetrics,
   openDappAndTriggerSignature,
@@ -80,6 +84,8 @@ describe('Malicious Confirmation Signature - Bad Domain @no-mmi', function (this
             alert_visualized: [],
             alert_visualized_count: 0,
           },
+          securityAlertReason: BlockaidReason.notApplicable,
+          securityAlertResponse: BlockaidResultType.NotApplicable,
         });
       },
       mockSignatureRejected,
@@ -130,6 +136,8 @@ describe('Malicious Confirmation Signature - Bad Domain @no-mmi', function (this
             alert_visualized: ['requestFrom'],
             alert_visualized_count: 1,
           },
+          securityAlertReason: BlockaidReason.notApplicable,
+          securityAlertResponse: BlockaidResultType.NotApplicable,
         });
       },
       mockSignatureRejected,
diff --git a/test/e2e/tests/confirmations/signatures/signature-helpers.ts b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
index 5242be3f3c20..a4c5e9309249 100644
--- a/test/e2e/tests/confirmations/signatures/signature-helpers.ts
+++ b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
@@ -8,6 +8,10 @@ import {
   unlockWallet,
 } from '../../../helpers';
 import { Driver } from '../../../webdriver/driver';
+import {
+  BlockaidReason,
+  BlockaidResultType,
+} from '../../../../../shared/constants/security-provider';
 
 export const WALLET_ADDRESS = '0x5CfE73b6021E818B776b421B1c4Db2474086a7e1';
 export const WALLET_ETH_BALANCE = '25';
@@ -31,6 +35,8 @@ type AssertSignatureMetricsOptions = {
   location?: string;
   expectedProps?: Record<string, unknown>;
   withAnonEvents?: boolean;
+  securityAlertReason?: string;
+  securityAlertResponse?: string;
 };
 
 type SignatureEventProperty = {
@@ -40,7 +46,7 @@ type SignatureEventProperty = {
   environment_type: 'background';
   locale: 'en';
   security_alert_reason: string;
-  security_alert_response: 'NotApplicable';
+  security_alert_response: string;
   signature_type: string;
   eip712_primary_type?: string;
   ui_customizations?: string[];
@@ -59,11 +65,15 @@ const signatureAnonProperties = {
  * @param signatureType
  * @param primaryType
  * @param uiCustomizations
+ * @param securityAlertReason
+ * @param securityAlertResponse
  */
 function getSignatureEventProperty(
   signatureType: string,
   primaryType: string,
   uiCustomizations: string[],
+  securityAlertReason: string = BlockaidReason.checkingChain,
+  securityAlertResponse: string = BlockaidResultType.Loading,
 ): SignatureEventProperty {
   const signatureEventProperty: SignatureEventProperty = {
     account_type: 'MetaMask',
@@ -72,8 +82,8 @@ function getSignatureEventProperty(
     chain_id: '0x539',
     environment_type: 'background',
     locale: 'en',
-    security_alert_reason: 'NotApplicable',
-    security_alert_response: 'NotApplicable',
+    security_alert_reason: securityAlertReason,
+    security_alert_response: securityAlertResponse,
     ui_customizations: uiCustomizations,
   };
 
@@ -90,15 +100,15 @@ function assertSignatureRequestedMetrics(
   signatureEventProperty: SignatureEventProperty,
   withAnonEvents = false,
 ) {
-  assertEventPropertiesMatch(events, 'Signature Requested', {
-    ...signatureEventProperty,
-    security_alert_reason: 'NotApplicable',
-  });
+  assertEventPropertiesMatch(
+    events,
+    'Signature Requested',
+    signatureEventProperty,
+  );
 
   if (withAnonEvents) {
     assertEventPropertiesMatch(events, 'Signature Requested Anon', {
       ...signatureEventProperty,
-      security_alert_reason: 'NotApplicable',
       ...signatureAnonProperties,
     });
   }
@@ -111,12 +121,16 @@ export async function assertSignatureConfirmedMetrics({
   primaryType = '',
   uiCustomizations = ['redesigned_confirmation'],
   withAnonEvents = false,
+  securityAlertReason,
+  securityAlertResponse,
 }: AssertSignatureMetricsOptions) {
   const events = await getEventPayloads(driver, mockedEndpoints);
   const signatureEventProperty = getSignatureEventProperty(
     signatureType,
     primaryType,
     uiCustomizations,
+    securityAlertReason,
+    securityAlertResponse,
   );
 
   assertSignatureRequestedMetrics(
@@ -148,12 +162,16 @@ export async function assertSignatureRejectedMetrics({
   location,
   expectedProps = {},
   withAnonEvents = false,
+  securityAlertReason,
+  securityAlertResponse,
 }: AssertSignatureMetricsOptions) {
   const events = await getEventPayloads(driver, mockedEndpoints);
   const signatureEventProperty = getSignatureEventProperty(
     signatureType,
     primaryType,
     uiCustomizations,
+    securityAlertReason,
+    securityAlertResponse,
   );
 
   assertSignatureRequestedMetrics(
@@ -201,14 +219,44 @@ function assertEventPropertiesMatch(
   expectedProperties: object,
 ) {
   const event = events.find((e) => e.event === eventName);
+
+  const actualProperties = { ...event.properties };
+  const expectedProps = { ...expectedProperties };
+
+  compareSecurityAlertResponse(actualProperties, expectedProps, eventName);
+
   assert(event, `${eventName} event not found`);
   assert.deepStrictEqual(
-    event.properties,
-    expectedProperties,
+    actualProperties,
+    expectedProps,
     `${eventName} event properties do not match`,
   );
 }
 
+function compareSecurityAlertResponse(
+  actualProperties: Record<string, unknown>,
+  expectedProperties: Record<string, unknown>,
+  eventName: string,
+) {
+  if (
+    expectedProperties.security_alert_response &&
+    (expectedProperties.security_alert_response === 'loading' ||
+      expectedProperties.security_alert_response === 'Benign')
+  ) {
+    if (
+      actualProperties.security_alert_response !== 'loading' &&
+      actualProperties.security_alert_response !== 'Benign'
+    ) {
+      assert.fail(
+        `${eventName} event properties do not match: security_alert_response is ${actualProperties.security_alert_response}`,
+      );
+    }
+    // Remove the property from both objects to avoid comparison
+    delete actualProperties.security_alert_response;
+    delete expectedProperties.security_alert_response;
+  }
+}
+
 export async function clickHeaderInfoBtn(driver: Driver) {
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
diff --git a/test/e2e/tests/confirmations/signatures/siwe.spec.ts b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
index 2a7b43ba1099..889122eb22b8 100644
--- a/test/e2e/tests/confirmations/signatures/siwe.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
@@ -11,6 +11,10 @@ import {
   withRedesignConfirmationFixtures,
 } from '../helpers';
 import { TestSuiteArguments } from '../transactions/shared';
+import {
+  BlockaidReason,
+  BlockaidResultType,
+} from '../../../../../shared/constants/security-provider';
 import {
   assertAccountDetailsMetrics,
   assertHeaderInfoBalance,
@@ -60,6 +64,8 @@ describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
             'redesigned_confirmation',
             'sign_in_with_ethereum',
           ],
+          securityAlertReason: BlockaidReason.notApplicable,
+          securityAlertResponse: BlockaidResultType.NotApplicable,
         });
       },
       mockSignatureApproved,
@@ -95,6 +101,8 @@ describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
             'sign_in_with_ethereum',
           ],
           location: 'confirmation',
+          securityAlertReason: BlockaidReason.notApplicable,
+          securityAlertResponse: BlockaidResultType.NotApplicable,
         });
       },
       mockSignatureRejected,
diff --git a/test/e2e/tests/metrics/signature-approved.spec.js b/test/e2e/tests/metrics/signature-approved.spec.js
index c6990820af8b..2ea84d281b50 100644
--- a/test/e2e/tests/metrics/signature-approved.spec.js
+++ b/test/e2e/tests/metrics/signature-approved.spec.js
@@ -1,4 +1,5 @@
 const { strict: assert } = require('assert');
+
 const {
   defaultGanacheOptions,
   switchToNotificationWindow,
@@ -47,6 +48,16 @@ async function mockSegment(mockServer) {
   ];
 }
 
+const expectedEventPropertiesBase = {
+  account_type: 'MetaMask',
+  category: 'inpage_provider',
+  locale: 'en',
+  chain_id: '0x539',
+  environment_type: 'background',
+  security_alert_reason: 'CheckingChain',
+  security_alert_response: 'loading',
+};
+
 describe('Signature Approved Event @no-mmi', function () {
   it('Successfully tracked for signTypedData_v4', async function () {
     await withFixtures(
@@ -76,31 +87,21 @@ describe('Signature Approved Event @no-mmi', function () {
         const events = await getEventPayloads(driver, mockedEndpoints);
 
         assert.deepStrictEqual(events[0].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData_v4',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
           eip712_primary_type: 'Mail',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
         });
 
         assert.deepStrictEqual(events[1].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData_v4',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
           eip712_primary_type: 'Mail',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
+          security_alert_response: 'Benign',
         });
       },
     );
   });
+
   it('Successfully tracked for signTypedData_v3', async function () {
     await withFixtures(
       {
@@ -127,29 +128,21 @@ describe('Signature Approved Event @no-mmi', function () {
         await validateContractDetails(driver);
         await clickSignOnSignatureConfirmation({ driver });
         const events = await getEventPayloads(driver, mockedEndpoints);
+
         assert.deepStrictEqual(events[0].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData_v3',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
         });
+
         assert.deepStrictEqual(events[1].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData_v3',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
+          security_alert_response: 'Benign',
         });
       },
     );
   });
+
   it('Successfully tracked for signTypedData', async function () {
     await withFixtures(
       {
@@ -175,29 +168,21 @@ describe('Signature Approved Event @no-mmi', function () {
         await switchToNotificationWindow(driver);
         await clickSignOnSignatureConfirmation({ driver });
         const events = await getEventPayloads(driver, mockedEndpoints);
+
         assert.deepStrictEqual(events[0].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
         });
+
         assert.deepStrictEqual(events[1].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'eth_signTypedData',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
+          security_alert_response: 'Benign',
         });
       },
     );
   });
+
   it('Successfully tracked for personalSign', async function () {
     await withFixtures(
       {
@@ -223,25 +208,16 @@ describe('Signature Approved Event @no-mmi', function () {
         await switchToNotificationWindow(driver);
         await clickSignOnSignatureConfirmation({ driver });
         const events = await getEventPayloads(driver, mockedEndpoints);
+
         assert.deepStrictEqual(events[0].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'personal_sign',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
         });
+
         assert.deepStrictEqual(events[1].properties, {
-          account_type: 'MetaMask',
+          ...expectedEventPropertiesBase,
           signature_type: 'personal_sign',
-          category: 'inpage_provider',
-          locale: 'en',
-          chain_id: '0x539',
-          environment_type: 'background',
-          security_alert_reason: 'NotApplicable',
-          security_alert_response: 'NotApplicable',
+          security_alert_response: 'Benign',
         });
       },
     );

From 2b7101df5dcd7e11dac7608c1ea1abbaa37db4c8 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Tue, 12 Nov 2024 13:20:53 +0100
Subject: [PATCH 074/111] feat: add `account_type`/`snap_id` for buy/send
 metrics (#28011)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds more context/info to the Send/Buy events for both Ethereum and
Bitcoin overview screens.

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

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/636,
https://github.com/MetaMask/accounts-planning/issues/637

## **Manual testing steps**

- Cherry-pick this commit: f938d6d18cd977ba53eb68668a2d475e26b8a131
* This will allow you to use the verbose mode for the local segment
server
- `node development/mock-segment.js -v`
- `yarn start:flask`
- Create a Bitcoin account (enable support from the experimental
settings)
- Select a Bitcoin account
- Click on "Buy" button using your Bitcoin account
- Click on "Send" button using your Bitcoin account
- Create an Ethereum account
- Click on "Buy" button using your Bitcoin account
- Click on "Send" button using your Bitcoin account

You should see those events from the `mock-segment.js` server output:
```
...
[mock-segment]: Events received: Buy Button Clicked {
  "account_type": "bip122:p2wpkh",
  "location": "Home",
  "text": "Buy",
  "chain_id": "bip122:000000000019d6689c085ae165831e93",
  "snap_id": "npm:@metamask/bitcoin-wallet-snap",
  "category": "Navigation",
  "locale": "en",
  "environment_type": "popup"
}
...
[mock-segment]: Events received: Send Button Clicked {
  "account_type": "bip122:p2wpkh",
  "token_symbol": "BTC",
  "location": "Home",
  "text": "Send",
  "chain_id": "bip122:000000000019d6689c085ae165831e93",
  "snap_id": "npm:@metamask/bitcoin-wallet-snap",
  "category": "Navigation",
  "locale": "en",
  "environment_type": "popup"
}
...
[mock-segment]: Events received: Buy Button Clicked {
  "account_type": "eip155:eoa",
  "location": "Home",
  "text": "Buy",
  "chain_id": "0x1",
  "token_symbol": {
    "symbol": "ETH",
    "name": "Ether",
    "address": "0x0000000000000000000000000000000000000000",
    "decimals": 18,
    "iconUrl": "./images/eth_logo.svg",
    "balance": "0",
    "string": "0"
  },
  "category": "Navigation",
  "locale": "en",
  "environment_type": "popup"
}
...
[mock-segment]: Events received: Send Button Clicked {
  "account_type": "eip155:eoa",
  "token_symbol": "ETH",
  "location": "Home",
  "text": "Send",
  "chain_id": "0x1",
  "category": "Navigation",
  "locale": "en",
  "environment_type": "popup"
}
...
```

## **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/wallet-overview/btc-overview.test.tsx |  90 +++++++++
 .../app/wallet-overview/btc-overview.tsx      |   7 +-
 .../wallet-overview/coin-buttons.stories.js   |   4 +
 .../app/wallet-overview/coin-buttons.tsx      |  96 ++++++---
 .../app/wallet-overview/coin-overview.tsx     |   9 +-
 .../app/wallet-overview/eth-overview.js       |   1 +
 .../app/wallet-overview/eth-overview.test.js  | 191 ++++++++++++++----
 ui/pages/asset/components/asset-page.tsx      |   1 +
 8 files changed, 323 insertions(+), 76 deletions(-)

diff --git a/ui/components/app/wallet-overview/btc-overview.test.tsx b/ui/components/app/wallet-overview/btc-overview.test.tsx
index ffaed244e958..62e6f5ff82b3 100644
--- a/ui/components/app/wallet-overview/btc-overview.test.tsx
+++ b/ui/components/app/wallet-overview/btc-overview.test.tsx
@@ -11,14 +11,33 @@ import { MultichainNetworks } from '../../../../shared/constants/multichain/netw
 import { RampsMetaMaskEntry } from '../../../hooks/ramps/useRamps/useRamps';
 import { defaultBuyableChains } from '../../../ducks/ramps/constants';
 import { setBackgroundConnection } from '../../../store/background-connection';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import BtcOverview from './btc-overview';
 
+// We need to mock `dispatch` since we use it for `setDefaultHomeActiveTabName`.
+const mockDispatch = jest.fn().mockReturnValue(() => jest.fn());
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: () => mockDispatch,
+}));
+
+jest.mock('../../../store/actions', () => ({
+  handleSnapRequest: jest.fn(),
+  sendMultichainTransaction: jest.fn(),
+  setDefaultHomeActiveTabName: jest.fn(),
+}));
+
 const PORTOFOLIO_URL = 'https://portfolio.test';
 
 const BTC_OVERVIEW_BUY = 'coin-overview-buy';
 const BTC_OVERVIEW_BRIDGE = 'coin-overview-bridge';
 const BTC_OVERVIEW_RECEIVE = 'coin-overview-receive';
 const BTC_OVERVIEW_SWAP = 'token-overview-button-swap';
+const BTC_OVERVIEW_SEND = 'coin-overview-send';
 const BTC_OVERVIEW_PRIMARY_CURRENCY = 'coin-overview__primary-currency';
 
 const mockMetaMetricsId = 'deadbeef';
@@ -228,6 +247,39 @@ describe('BtcOverview', () => {
     });
   });
 
+  it('sends an event when clicking the Buy button', () => {
+    const storeWithBtcBuyable = getStore({
+      ramps: {
+        buyableChains: mockBuyableChainsWithBtc,
+      },
+    });
+
+    const mockTrackEvent = jest.fn();
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <BtcOverview />
+      </MetaMetricsContext.Provider>,
+      storeWithBtcBuyable,
+    );
+
+    const buyButton = queryByTestId(BTC_OVERVIEW_BUY);
+    expect(buyButton).toBeInTheDocument();
+    expect(buyButton).not.toBeDisabled();
+    fireEvent.click(buyButton as HTMLElement);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith({
+      event: MetaMetricsEventName.NavBuyButtonClicked,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        account_type: mockNonEvmAccount.type,
+        chain_id: MultichainNetworks.BITCOIN,
+        location: 'Home',
+        snap_id: mockNonEvmAccount.metadata.snap.id,
+        text: 'Buy',
+      },
+    });
+  });
+
   it('always show the Receive button', () => {
     const { queryByTestId } = renderWithProvider(<BtcOverview />, getStore());
     const receiveButton = queryByTestId(BTC_OVERVIEW_RECEIVE);
@@ -263,4 +315,42 @@ describe('BtcOverview', () => {
     expect(buyButton).toBeInTheDocument();
     expect(buyButton).toBeDisabled();
   });
+
+  it('always show the Send button', () => {
+    const { queryByTestId } = renderWithProvider(<BtcOverview />, getStore());
+    const sendButton = queryByTestId(BTC_OVERVIEW_SEND);
+    expect(sendButton).toBeInTheDocument();
+    expect(sendButton).not.toBeDisabled();
+  });
+
+  it('sends an event when clicking the Send button', () => {
+    const mockTrackEvent = jest.fn();
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <BtcOverview />
+      </MetaMetricsContext.Provider>,
+      getStore(),
+    );
+
+    const sendButton = queryByTestId(BTC_OVERVIEW_SEND);
+    expect(sendButton).toBeInTheDocument();
+    expect(sendButton).not.toBeDisabled();
+    fireEvent.click(sendButton as HTMLElement);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      {
+        event: MetaMetricsEventName.NavSendButtonClicked,
+        category: MetaMetricsEventCategory.Navigation,
+        properties: {
+          account_type: mockNonEvmAccount.type,
+          chain_id: MultichainNetworks.BITCOIN,
+          location: 'Home',
+          snap_id: mockNonEvmAccount.metadata.snap.id,
+          text: 'Send',
+          token_symbol: 'BTC',
+        },
+      },
+      expect.any(Object),
+    );
+  });
 });
diff --git a/ui/components/app/wallet-overview/btc-overview.tsx b/ui/components/app/wallet-overview/btc-overview.tsx
index 2ddaefd92f58..fb315d3ab3b0 100644
--- a/ui/components/app/wallet-overview/btc-overview.tsx
+++ b/ui/components/app/wallet-overview/btc-overview.tsx
@@ -9,9 +9,9 @@ import {
 } from '../../../selectors/multichain';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { getIsBitcoinBuyable } from '../../../ducks/ramps';
-import { getSelectedInternalAccount } from '../../../selectors';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 ///: END:ONLY_INCLUDE_IF
+import { getSelectedInternalAccount } from '../../../selectors';
 import { CoinOverview } from './coin-overview';
 
 type BtcOverviewProps = {
@@ -21,17 +21,18 @@ type BtcOverviewProps = {
 const BtcOverview = ({ className }: BtcOverviewProps) => {
   const { chainId } = useSelector(getMultichainProviderConfig);
   const balance = useSelector(getMultichainSelectedAccountCachedBalance);
+  const account = useSelector(getSelectedInternalAccount);
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  const selectedAccount = useSelector(getSelectedInternalAccount);
   const isBtcMainnetAccount = useMultichainSelector(
     getMultichainIsMainnet,
-    selectedAccount,
+    account,
   );
   const isBtcBuyable = useSelector(getIsBitcoinBuyable);
   ///: END:ONLY_INCLUDE_IF
 
   return (
     <CoinOverview
+      account={account}
       balance={balance}
       // We turn this off to avoid having that asterisk + the "Balance maybe be outdated" message for now
       balanceIsCached={false}
diff --git a/ui/components/app/wallet-overview/coin-buttons.stories.js b/ui/components/app/wallet-overview/coin-buttons.stories.js
index 40a6879673a8..028ebeee5b40 100644
--- a/ui/components/app/wallet-overview/coin-buttons.stories.js
+++ b/ui/components/app/wallet-overview/coin-buttons.stories.js
@@ -1,9 +1,13 @@
 import React from 'react';
+import testData from '../../../../.storybook/test-data';
 import CoinButtons from './coin-buttons';
 
+const { accounts, selectedAccount } = testData.metamask.internalAccounts;
+
 export default {
   title: 'Components/App/WalletOverview/CoinButtons',
   args: {
+    account: accounts[selectedAccount],
     chainId: '1',
     trackingLocation: 'home',
     isSwapsChain: true,
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index bac7872c79e3..3a499aa44dbf 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -24,7 +24,7 @@ import {
 } from '@metamask/utils';
 
 ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-import { BtcAccountType } from '@metamask/keyring-api';
+import { BtcAccountType, InternalAccount } from '@metamask/keyring-api';
 ///: END:ONLY_INCLUDE_IF
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { ChainId } from '../../../../shared/constants/network';
@@ -51,7 +51,6 @@ import {
   getCurrentKeyring,
   ///: END:ONLY_INCLUDE_IF
   getUseExternalServices,
-  getSelectedAccount,
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   getMemoizedUnapprovedTemplatedConfirmations,
   ///: END:ONLY_INCLUDE_IF
@@ -90,8 +89,29 @@ import {
 } from '../../../store/actions';
 import { BITCOIN_WALLET_SNAP_ID } from '../../../../shared/lib/accounts/bitcoin-wallet-snap';
 ///: END:ONLY_INCLUDE_IF
+import {
+  getMultichainIsEvm,
+  getMultichainNativeCurrency,
+} from '../../../selectors/multichain';
+import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
+
+type CoinButtonsProps = {
+  account: InternalAccount;
+  chainId: `0x${string}` | CaipChainId | number;
+  trackingLocation: string;
+  isSwapsChain: boolean;
+  isSigningEnabled: boolean;
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  isBridgeChain: boolean;
+  isBuyableChain: boolean;
+  defaultSwapsToken?: SwapsEthToken;
+  ///: END:ONLY_INCLUDE_IF
+  classPrefix?: string;
+  iconButtonClassName?: string;
+};
 
 const CoinButtons = ({
+  account,
   chainId,
   trackingLocation,
   isSwapsChain,
@@ -103,26 +123,13 @@ const CoinButtons = ({
   ///: END:ONLY_INCLUDE_IF
   classPrefix = 'coin',
   iconButtonClassName = '',
-}: {
-  chainId: `0x${string}` | CaipChainId | number;
-  trackingLocation: string;
-  isSwapsChain: boolean;
-  isSigningEnabled: boolean;
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  isBridgeChain: boolean;
-  isBuyableChain: boolean;
-  defaultSwapsToken?: SwapsEthToken;
-  ///: END:ONLY_INCLUDE_IF
-  classPrefix?: string;
-  iconButtonClassName?: string;
-}) => {
+}: CoinButtonsProps) => {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
 
   const trackEvent = useContext(MetaMetricsContext);
   const [showReceiveModal, setShowReceiveModal] = useState(false);
 
-  const account = useSelector(getSelectedAccount);
   const { address: selectedAddress } = account;
   const history = useHistory();
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
@@ -131,6 +138,16 @@ const CoinButtons = ({
   const usingHardwareWallet = isHardwareKeyring(keyring?.type);
   ///: END:ONLY_INCLUDE_IF
 
+  // Initially, those events were using a "ETH" as `token_symbol`, so we keep this behavior
+  // for EVM, no matter the currently selected native token (e.g. SepoliaETH if you are on Sepolia
+  // network).
+  const isEvm = useMultichainSelector(getMultichainIsEvm, account);
+  const multichainNativeToken = useMultichainSelector(
+    getMultichainNativeCurrency,
+    account,
+  );
+  const nativeToken = isEvm ? 'ETH' : multichainNativeToken;
+
   const isExternalServicesEnabled = useSelector(getUseExternalServices);
 
   const buttonTooltips = {
@@ -180,6 +197,23 @@ const CoinButtons = ({
   };
   ///: END:ONLY_INCLUDE_IF
 
+  const getSnapAccountMetaMetricsPropertiesIfAny = (
+    internalAccount: InternalAccount,
+  ): { snap_id?: string } => {
+    // Some accounts might be Snap accounts, in this case we add some extra properties
+    // to the metrics:
+    const snapId = internalAccount.metadata.snap?.id;
+    if (snapId) {
+      return {
+        snap_id: snapId,
+      };
+    }
+
+    // If the account is not a Snap account or that we could not get the Snap ID for
+    // some reason, we don't add any extra property.
+    return {};
+  };
+
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const mmiPortfolioEnabled = useSelector(getMmiPortfolioEnabled);
   const mmiPortfolioUrl = useSelector(getMmiPortfolioUrl);
@@ -276,6 +310,21 @@ const CoinButtons = ({
   ///: END:ONLY_INCLUDE_IF
 
   const handleSendOnClick = useCallback(async () => {
+    trackEvent(
+      {
+        event: MetaMetricsEventName.NavSendButtonClicked,
+        category: MetaMetricsEventCategory.Navigation,
+        properties: {
+          account_type: account.type,
+          token_symbol: nativeToken,
+          location: 'Home',
+          text: 'Send',
+          chain_id: chainId,
+          ...getSnapAccountMetaMetricsPropertiesIfAny(account),
+        },
+      },
+      { excludeMetaMetricsId: false },
+    );
     switch (account.type) {
       ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
       case BtcAccountType.P2wpkh: {
@@ -291,19 +340,6 @@ const CoinButtons = ({
       }
       ///: END:ONLY_INCLUDE_IF
       default: {
-        trackEvent(
-          {
-            event: MetaMetricsEventName.NavSendButtonClicked,
-            category: MetaMetricsEventCategory.Navigation,
-            properties: {
-              token_symbol: 'ETH',
-              location: 'Home',
-              text: 'Send',
-              chain_id: chainId,
-            },
-          },
-          { excludeMetaMetricsId: false },
-        );
         await dispatch(startNewDraftTransaction({ type: AssetType.native }));
         history.push(SEND_ROUTE);
       }
@@ -358,10 +394,12 @@ const CoinButtons = ({
       event: MetaMetricsEventName.NavBuyButtonClicked,
       category: MetaMetricsEventCategory.Navigation,
       properties: {
+        account_type: account.type,
         location: 'Home',
         text: 'Buy',
         chain_id: chainId,
         token_symbol: defaultSwapsToken,
+        ...getSnapAccountMetaMetricsPropertiesIfAny(account),
       },
     });
   }, [chainId, defaultSwapsToken]);
diff --git a/ui/components/app/wallet-overview/coin-overview.tsx b/ui/components/app/wallet-overview/coin-overview.tsx
index 93d9e1061428..2244f3b33e82 100644
--- a/ui/components/app/wallet-overview/coin-overview.tsx
+++ b/ui/components/app/wallet-overview/coin-overview.tsx
@@ -11,6 +11,7 @@ import { zeroAddress } from 'ethereumjs-util';
 import { CaipChainId } from '@metamask/utils';
 import type { Hex } from '@metamask/utils';
 
+import { InternalAccount } from '@metamask/keyring-api';
 import {
   Box,
   ButtonIcon,
@@ -45,7 +46,6 @@ import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display
 import { PRIMARY } from '../../../helpers/constants/common';
 import {
   getPreferences,
-  getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getTokensMarketData,
   getIsTestnet,
@@ -74,6 +74,7 @@ import CoinButtons from './coin-buttons';
 import { AggregatedPercentageOverview } from './aggregated-percentage-overview';
 
 export type CoinOverviewProps = {
+  account: InternalAccount;
   balance: string;
   balanceIsCached: boolean;
   className?: string;
@@ -90,6 +91,7 @@ export type CoinOverviewProps = {
 };
 
 export const CoinOverview = ({
+  account,
   balance,
   balanceIsCached,
   className,
@@ -121,7 +123,6 @@ export const CoinOverview = ({
 
   ///: END:ONLY_INCLUDE_IF
 
-  const account = useSelector(getSelectedAccount);
   const showNativeTokenAsMainBalanceRoute = getSpecificSettingsRoute(
     t,
     t('general'),
@@ -135,12 +136,11 @@ export const CoinOverview = ({
   const { showFiatInTestnets, privacyMode, showNativeTokenAsMainBalance } =
     useSelector(getPreferences);
 
-  const selectedAccount = useSelector(getSelectedAccount);
   const shouldHideZeroBalanceTokens = useSelector(
     getShouldHideZeroBalanceTokens,
   );
   const { totalFiatBalance, loading } = useAccountTotalFiatBalance(
-    selectedAccount,
+    account,
     shouldHideZeroBalanceTokens,
   );
 
@@ -368,6 +368,7 @@ export const CoinOverview = ({
       buttons={
         <CoinButtons
           {...{
+            account,
             trackingLocation: 'home',
             chainId,
             isSwapsChain,
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index 684c6cffbf6b..c42986ab30ab 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -39,6 +39,7 @@ const EthOverview = ({ className }) => {
 
   return (
     <CoinOverview
+      account={account}
       balance={balance}
       balanceIsCached={balanceIsCached}
       className={className}
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index cea749a366db..539cfbb6c59f 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -12,8 +12,20 @@ import { ETH_EOA_METHODS } from '../../../../shared/constants/eth-methods';
 import { getIntlLocale } from '../../../ducks/locale/locale';
 import { setBackgroundConnection } from '../../../store/background-connection';
 import { mockNetworkState } from '../../../../test/stub/networks';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import EthOverview from './eth-overview';
 
+// We need to mock `dispatch` since we use it for `setDefaultHomeActiveTabName`.
+const mockDispatch = jest.fn().mockReturnValue(() => jest.fn());
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: () => mockDispatch,
+}));
+
 jest.mock('../../../hooks/useIsOriginalNativeTokenSymbol', () => {
   return {
     useIsOriginalNativeTokenSymbol: jest.fn(),
@@ -24,6 +36,10 @@ jest.mock('../../../ducks/locale/locale', () => ({
   getIntlLocale: jest.fn(),
 }));
 
+jest.mock('../../../store/actions', () => ({
+  startNewDraftTransaction: jest.fn(),
+}));
+
 const mockGetIntlLocale = getIntlLocale;
 
 let openTabSpy;
@@ -32,18 +48,46 @@ describe('EthOverview', () => {
   useIsOriginalNativeTokenSymbol.mockReturnValue(true);
   mockGetIntlLocale.mockReturnValue('en-US');
 
+  const mockEvmAccount1 = {
+    address: '0x1',
+    id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+    metadata: {
+      name: 'Account 1',
+      keyring: {
+        type: KeyringType.imported,
+      },
+    },
+    options: {},
+    methods: ETH_EOA_METHODS,
+    type: EthAccountType.Eoa,
+  };
+
+  const mockEvmAccount2 = {
+    address: '0x2',
+    id: 'e9b992f9-e151-4317-b8b7-c771bb73dd02',
+    metadata: {
+      name: 'Account 2',
+      keyring: {
+        type: KeyringType.imported,
+      },
+    },
+    options: {},
+    methods: ETH_EOA_METHODS,
+    type: EthAccountType.Eoa,
+  };
+
   const mockStore = {
     metamask: {
       ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
       accountsByChainId: {
         [CHAIN_IDS.MAINNET]: {
-          '0x1': { address: '0x1', balance: '0x1F4' },
+          '0x1': { address: mockEvmAccount1.address, balance: '0x1F4' },
         },
       },
       tokenList: [],
       cachedBalances: {
         '0x1': {
-          '0x1': '0x1F4',
+          [mockEvmAccount1.address]: '0x1F4',
         },
       },
       preferences: {
@@ -58,46 +102,22 @@ describe('EthOverview', () => {
         },
       },
       accounts: {
-        '0x1': {
-          address: '0x1',
+        [mockEvmAccount1.address]: {
+          address: mockEvmAccount1.address,
           balance: '0x1F4',
         },
       },
       internalAccounts: {
         accounts: {
-          'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3': {
-            address: '0x1',
-            id: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
-            metadata: {
-              name: 'Account 1',
-              keyring: {
-                type: KeyringType.imported,
-              },
-            },
-            options: {},
-            methods: ETH_EOA_METHODS,
-            type: EthAccountType.Eoa,
-          },
-          'e9b992f9-e151-4317-b8b7-c771bb73dd02': {
-            address: '0x2',
-            id: 'e9b992f9-e151-4317-b8b7-c771bb73dd02',
-            metadata: {
-              name: 'Account 2',
-              keyring: {
-                type: KeyringType.imported,
-              },
-            },
-            options: {},
-            methods: ETH_EOA_METHODS,
-            type: EthAccountType.Eoa,
-          },
+          [mockEvmAccount1.id]: mockEvmAccount1,
+          [mockEvmAccount2.id]: mockEvmAccount2,
         },
-        selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
+        selectedAccount: mockEvmAccount1.id,
       },
       keyrings: [
         {
           type: KeyringType.imported,
-          accounts: ['0x1', '0x2'],
+          accounts: [mockEvmAccount1.address, mockEvmAccount2.address],
         },
         {
           type: KeyringType.ledger,
@@ -381,6 +401,36 @@ describe('EthOverview', () => {
     });
   });
 
+  it('sends an event when clicking the Buy button: %s', () => {
+    const mockTrackEvent = jest.fn();
+
+    const mockedStore = configureMockStore([thunk])(mockStore);
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <EthOverview />
+      </MetaMetricsContext.Provider>,
+      mockedStore,
+    );
+
+    const buyButton = queryByTestId(ETH_OVERVIEW_BUY);
+    expect(buyButton).toBeInTheDocument();
+    expect(buyButton).not.toBeDisabled();
+    fireEvent.click(buyButton);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith({
+      event: MetaMetricsEventName.NavBuyButtonClicked,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        account_type: mockEvmAccount1.type,
+        chain_id: CHAIN_IDS.MAINNET,
+        location: 'Home',
+        text: 'Buy',
+        // We use a `SwapsEthToken` in this case, so we're expecting an entire object here.
+        token_symbol: expect.any(Object),
+      },
+    });
+  });
+
   describe('Disabled buttons when an account cannot sign transactions', () => {
     const buttonTestCases = [
       { testId: ETH_OVERVIEW_SEND, buttonText: 'Send' },
@@ -391,15 +441,30 @@ describe('EthOverview', () => {
     it.each(buttonTestCases)(
       'should have the $buttonText button disabled when an account cannot sign transactions or user operations',
       ({ testId, buttonText }) => {
-        mockStore.metamask.internalAccounts.accounts[
-          'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3'
-        ].methods = Object.values(EthMethod).filter(
-          (method) =>
-            method !== EthMethod.SignTransaction &&
-            method !== EthMethod.SignUserOperation,
-        );
+        const mockedStoreWithoutSigningMethods = {
+          ...mockStore,
+          metamask: {
+            ...mockStore.metamask,
+            internalAccounts: {
+              ...mockStore.metamask.internalAccounts,
+              accounts: {
+                [mockEvmAccount1.id]: {
+                  ...mockEvmAccount1,
+                  // Filter out all methods used for signing transactions.
+                  methods: Object.values(EthMethod).filter(
+                    (method) =>
+                      method !== EthMethod.SignTransaction &&
+                      method !== EthMethod.SignUserOperation,
+                  ),
+                },
+              },
+            },
+          },
+        };
 
-        const mockedStore = configureMockStore([thunk])(mockStore);
+        const mockedStore = configureMockStore([thunk])(
+          mockedStoreWithoutSigningMethods,
+        );
         const { queryByTestId, queryByText } = renderWithProvider(
           <EthOverview />,
           mockedStore,
@@ -415,4 +480,50 @@ describe('EthOverview', () => {
       },
     );
   });
+
+  it.each([
+    CHAIN_IDS.MAINNET,
+    // We want to test with a different chain ID than mainnet to make sure the events are still using
+    // the right `token_symbol`.
+    CHAIN_IDS.SEPOLIA,
+  ])('sends an event when clicking the Send button: %s', (chainId) => {
+    const mockTrackEvent = jest.fn();
+    const mockedStoreWithSpecificChainId = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        ...mockNetworkState({ chainId }),
+      },
+    };
+
+    const mockedStore = configureMockStore([thunk])(
+      mockedStoreWithSpecificChainId,
+    );
+    const { queryByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <EthOverview />
+      </MetaMetricsContext.Provider>,
+      mockedStore,
+    );
+
+    const sendButton = queryByTestId(ETH_OVERVIEW_SEND);
+    expect(sendButton).toBeInTheDocument();
+    expect(sendButton).not.toBeDisabled();
+    fireEvent.click(sendButton);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith(
+      {
+        event: MetaMetricsEventName.NavSendButtonClicked,
+        category: MetaMetricsEventCategory.Navigation,
+        properties: {
+          account_type: mockEvmAccount1.type,
+          chain_id: chainId,
+          location: 'Home',
+          text: 'Send',
+          token_symbol: 'ETH',
+        },
+      },
+      expect.any(Object),
+    );
+  });
 });
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index c70b60169edb..0d73188d145e 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -166,6 +166,7 @@ const AssetPage = ({
         {type === AssetType.native ? (
           <CoinButtons
             {...{
+              account,
               trackingLocation: 'asset-page',
               isBuyableChain,
               isSigningEnabled,

From 81008f63bedc22b9d9f0ded93eabe474813eaa84 Mon Sep 17 00:00:00 2001
From: Harika <153644847+hjetpoluru@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:20:55 -0500
Subject: [PATCH 075/111] fix: `Test Snap Cronjob can trigger a cronjob to open
 a di...` flaky tests (#28363)
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 flaky test is due to the dialog taking time to appear and
disappear, which is the expected behavior. I have attached a video
demonstrating the current behavior.


https://github.com/user-attachments/assets/66c68d05-a2dc-4bb5-8870-c967ea9d630a

To address this issue, I added retry logic and validation. However, I
noticed that when the dialog does not appear, `switchToWindowWithTitle`
method throws an exception and fails the test hence causing the retry
logic to be ineffective. Implementation is in the first commit in this
PR b97dbbea9d67a708b078a69d64d832d9badd16bd.

Fixing this issue within the framework would require significant effort
and could impact other tests. Therefore, I have implemented a wait
period before attempting to switch to the window. This approach ensures
that the dialog has enough time to appear, thereby reducing the
likelihood of test failures.

<!--
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/28363?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

Run the test locally or in codespaces using below command
yarn
yarn build:test:webpack
ENABLE_MV3=false yarn test:e2e:single
test/e2e/snaps/test-snap-cronjob.spec.js --browser=chrome
--leave-running

## **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
- [ ] 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/snaps/test-snap-cronjob.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/e2e/snaps/test-snap-cronjob.spec.js b/test/e2e/snaps/test-snap-cronjob.spec.js
index 6f4e05883943..5fbc22d7ad71 100644
--- a/test/e2e/snaps/test-snap-cronjob.spec.js
+++ b/test/e2e/snaps/test-snap-cronjob.spec.js
@@ -3,6 +3,7 @@ const {
   withFixtures,
   unlockWallet,
   WINDOW_TITLES,
+  largeDelayMs,
 } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
@@ -74,7 +75,9 @@ describe('Test Snap Cronjob', function () {
           text: 'Reconnect to Cronjobs Snap',
         });
 
-        // switch to dialog popup, wait for a maximum of 65 seconds
+        // Switching to dialog popup takes time, hence this wait is needed
+        await driver.delay(largeDelayMs);
+
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
         // look for the dialog popup to verify cronjob fired

From ea00b029ea66e08b6fffaad1696a5b699dd27a55 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 12 Nov 2024 11:34:27 -0330
Subject: [PATCH 076/111] ci: Fix `attributions:check` silent failure (#28413)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The script `attributions:check` was silently failing when the attempt to
generate attributions failed. This led to the attributions in v12.6.0
being out-of-date.

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

## **Related issues**

Relates to #28412

## **Manual testing steps**

1. Run `yarn attributions:check`. See that the exit code is non-zero
* on `develop` it also fails, but with a zero exit code, indicating
success despite the fact that it failed.

## **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.
---
 development/attributions-check.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/development/attributions-check.sh b/development/attributions-check.sh
index 56ae63e7e1d3..15424e81b889 100755
--- a/development/attributions-check.sh
+++ b/development/attributions-check.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+set -e
+set -u
+set -o pipefail
+
 yarn attributions:generate
 
 ATTRIBUTIONS_FILE="./attribution.txt"

From 36cee88efe1885d656d4ba571938ab172dda32d6 Mon Sep 17 00:00:00 2001
From: Salim TOUBAL <salim.toubal@outlook.com>
Date: Tue, 12 Nov 2024 18:57:31 +0100
Subject: [PATCH 077/111] fix: fix network client ID used on the
 useGasFeeInputs hook (#28391)
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 I delete Sepolia and re-add it again I get the error No Infura
network client was found with the ID "sepolia".
The requests are working normally
<!--
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/28391?quickstart=1)

## **Related issues**

Fixes: #28263 #28247

## **Manual testing steps**

1. process transaction using sepolia
2. delete sepolia network
3. add it and go to activity tab

## **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.
---
 ui/pages/confirmations/hooks/test-utils.js           |  4 ++++
 ui/pages/confirmations/hooks/useGasFeeInputs.js      | 10 +++++++++-
 ui/pages/confirmations/hooks/useGasFeeInputs.test.js | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ui/pages/confirmations/hooks/test-utils.js b/ui/pages/confirmations/hooks/test-utils.js
index 5e327b0467c5..0cda95770107 100644
--- a/ui/pages/confirmations/hooks/test-utils.js
+++ b/ui/pages/confirmations/hooks/test-utils.js
@@ -11,6 +11,7 @@ import {
   getTokenExchangeRates,
   getPreferences,
   selectConversionRateByChainId,
+  selectNetworkConfigurationByChainId,
 } from '../../../selectors';
 
 import {
@@ -121,6 +122,9 @@ export const generateUseSelectorRouter =
     ) {
       return 'USD';
     }
+    if (selector === selectNetworkConfigurationByChainId) {
+      return '2';
+    }
     if (
       selector === getMultichainShouldShowFiat ||
       selector === getShouldShowFiat
diff --git a/ui/pages/confirmations/hooks/useGasFeeInputs.js b/ui/pages/confirmations/hooks/useGasFeeInputs.js
index 27a60ad5f043..8675b726038a 100644
--- a/ui/pages/confirmations/hooks/useGasFeeInputs.js
+++ b/ui/pages/confirmations/hooks/useGasFeeInputs.js
@@ -11,6 +11,7 @@ import { GAS_FORM_ERRORS } from '../../../helpers/constants/gas';
 import {
   checkNetworkAndAccountSupports1559,
   getAdvancedInlineGasShown,
+  selectNetworkConfigurationByChainId,
 } from '../../../selectors';
 import { isLegacyTransaction } from '../../../helpers/utils/transactions.util';
 import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
@@ -118,6 +119,13 @@ export function useGasFeeInputs(
     ? retryTxMeta
     : _transaction;
 
+  const network = useSelector((state) =>
+    selectNetworkConfigurationByChainId(state, transaction?.chainId),
+  );
+
+  const networkClientId =
+    network?.rpcEndpoints?.[network?.defaultRpcEndpointIndex]?.networkClientId;
+
   const supportsEIP1559 =
     useSelector(checkNetworkAndAccountSupports1559) &&
     !isLegacyTransaction(transaction?.txParams);
@@ -130,7 +138,7 @@ export function useGasFeeInputs(
     gasFeeEstimates,
     isGasEstimatesLoading,
     isNetworkBusy,
-  } = useGasFeeEstimates(transaction?.networkClientId);
+  } = useGasFeeEstimates(networkClientId);
 
   const userPrefersAdvancedGas = useSelector(getAdvancedInlineGasShown);
 
diff --git a/ui/pages/confirmations/hooks/useGasFeeInputs.test.js b/ui/pages/confirmations/hooks/useGasFeeInputs.test.js
index c7477d548735..48f78f42977f 100644
--- a/ui/pages/confirmations/hooks/useGasFeeInputs.test.js
+++ b/ui/pages/confirmations/hooks/useGasFeeInputs.test.js
@@ -50,6 +50,7 @@ jest.mock('../../../hooks/useMultichainSelector', () => ({
 const mockTransaction = {
   status: TransactionStatus.unapproved,
   type: TransactionType.simpleSend,
+  networkClientId: '2',
   txParams: {
     from: '0x000000000000000000000000000000000000dead',
     type: '0x2',
@@ -94,6 +95,7 @@ describe('useGasFeeInputs', () => {
           checkNetworkAndAccountSupports1559Response: false,
         }),
       );
+
       const { result } = renderHook(() => useGasFeeInputs());
       expect(result.current.gasPrice).toBe(
         LEGACY_GAS_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium,
@@ -187,9 +189,19 @@ describe('useGasFeeInputs', () => {
       );
       expect(result.current.balanceError).toBe(true);
     });
+
+    it('should call useGasFeeEstimates with correct networkClientId', () => {
+      renderHook(() => useGasFeeInputs(null, mockTransaction));
+      expect(useGasFeeEstimates).not.toHaveBeenCalledWith('2');
+    });
   });
 
   describe('editGasMode', () => {
+    beforeEach(() => {
+      useGasFeeEstimates.mockImplementation(
+        () => HIGH_FEE_MARKET_ESTIMATE_RETURN_VALUE,
+      );
+    });
     it('should return editGasMode passed', () => {
       const { result } = renderHook(() =>
         useGasFeeInputs(undefined, undefined, undefined, EditGasModes.swaps),

From a45b674fdac8e3965125b0a66ef3daa1e2e51de2 Mon Sep 17 00:00:00 2001
From: Davide Brocchetto <davide.brocchetto@consensys.net>
Date: Tue, 12 Nov 2024 19:27:56 +0100
Subject: [PATCH 078/111] test: Reintegrate refactored Swap e2e tests to the
 pipeline (#26493)
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 new extension e2e test automation includes the following test
scenarios after the code refactoring.

✓ 1 should swap native token ETH to DAI on Tenderly - Mainnet' (41.2s)
✓ 2 should swap unapproved token DAI to ETH on Tenderly - Mainnet'
(48.2s)
✓ 3 should swap native token ETH to WETH on Tenderly - Mainnet' (39.0s)
✓ 4 should swap wrapped token WETH to ETH on Tenderly - Mainnet' (38.8s)
✓ 5 should swap ERC20->ERC20 token DAI to USDC on Tenderly - Mainnet'
(41.0s)

Highlights:
- re-enabled the script to run in the github pipeline as optional
- removed flakiness
- switched to Tenderly corporate account as previously we were using my
personal
- added swap of unapproved token
- added swap of ERC20->ERC20 (DAI to USDC)


## **Related issues**

Fixes:

## **Manual testing steps**

1. yarn playwright install chromium
2. yarn
3. yarn dist
4. yarn test:e2e:swap

## **Screenshots/Recordings**


https://github.com/user-attachments/assets/4ca33cc5-f049-4e10-847a-ad2996bc673f



## **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                          |   3 +
 playwright.config.ts                          |   1 +
 .../pageObjects/network-controller-page.ts    |  90 +++++++---
 .../shared/pageObjects/signup-page.ts         |  38 ++++-
 .../shared/pageObjects/wallet-page.ts         |  26 +++
 .../playwright/swap/pageObjects/swap-page.ts  | 115 +++++++++----
 test/e2e/playwright/swap/specs/swap.spec.ts   | 158 +++++++++---------
 test/e2e/playwright/swap/tenderly-network.ts  |  50 ++++++
 8 files changed, 341 insertions(+), 140 deletions(-)
 create mode 100644 test/e2e/playwright/swap/tenderly-network.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa13dea93b75..03cb5091da4e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -234,6 +234,9 @@ workflows:
       - test-e2e-mmi-playwright:
           requires:
             - prep-build-test-mmi-playwright
+      - test-e2e-swap-playwright - OPTIONAL:
+          requires:
+            - prep-build
       - test-e2e-chrome-rpc-mmi:
           requires:
             - prep-build-test-mmi
diff --git a/playwright.config.ts b/playwright.config.ts
index 6632e1983e79..0145cd3dcc49 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -71,6 +71,7 @@ const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome'],
         headless: true,
       },
+      fullyParallel: false,
     },
     // Global: universal, common, shared, and non feature related tests
     {
diff --git a/test/e2e/playwright/shared/pageObjects/network-controller-page.ts b/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
index aed0e7377b16..1986de15dd88 100644
--- a/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
@@ -1,4 +1,5 @@
 import { type Locator, type Page } from '@playwright/test';
+import { Tenderly } from '../../swap/tenderly-network';
 
 export class NetworkController {
   readonly page: Page;
@@ -7,18 +8,12 @@ export class NetworkController {
 
   readonly addNetworkButton: Locator;
 
-  readonly addNetworkManuallyButton: Locator;
-
   readonly approveBtn: Locator;
 
   readonly saveBtn: Locator;
 
-  readonly switchToNetworkBtn: Locator;
-
   readonly gotItBtn: Locator;
 
-  readonly networkSearch: Locator;
-
   readonly networkName: Locator;
 
   readonly networkRpc: Locator;
@@ -27,43 +22,72 @@ export class NetworkController {
 
   readonly networkTicker: Locator;
 
+  readonly dismissBtn: Locator;
+
+  readonly networkList: Locator;
+
+  readonly networkListEdit: Locator;
+
+  readonly rpcName: Locator;
+
+  readonly addRpcDropDown: Locator;
+
+  readonly addRpcURLBtn: Locator;
+
+  readonly addURLBtn: Locator;
+
   constructor(page: Page) {
     this.page = page;
     this.networkDisplay = this.page.getByTestId('network-display');
-    this.addNetworkButton = this.page.getByText('Add network');
-    this.addNetworkManuallyButton = this.page.getByTestId(
-      'add-network-manually',
+    this.networkList = this.page.getByTestId(
+      'network-list-item-options-button-0x1',
     );
+    this.networkListEdit = this.page.getByTestId(
+      'network-list-item-options-edit',
+    );
+    this.addNetworkButton = this.page.getByText('Add a custom network');
+    this.addRpcDropDown = this.page.getByTestId('test-add-rpc-drop-down');
+    this.addRpcURLBtn = this.page.getByRole('button', { name: 'Add RPC URL' });
+    this.addURLBtn = this.page.getByRole('button', { name: 'Add URL' });
     this.saveBtn = this.page.getByRole('button', { name: 'Save' });
     this.approveBtn = this.page.getByTestId('confirmation-submit-button');
-    this.switchToNetworkBtn = this.page.locator('button', {
-      hasText: 'Switch to',
-    });
     this.gotItBtn = this.page.getByRole('button', { name: 'Got it' });
-    this.networkSearch = this.page.locator('input[type="search"]');
     this.networkName = this.page.getByTestId('network-form-network-name');
-    this.networkRpc = this.page.getByTestId('network-form-rpc-url');
+    this.rpcName = this.page.getByTestId('rpc-name-input-test');
+    this.networkRpc = this.page.getByTestId('rpc-url-input-test');
     this.networkChainId = this.page.getByTestId('network-form-chain-id');
     this.networkTicker = this.page.getByTestId('network-form-ticker-input');
+    this.dismissBtn = this.page.getByRole('button', { name: 'Dismiss' });
   }
 
   async addCustomNetwork(options: {
     name: string;
+    rpcName: string;
     url: string;
     chainID: string;
     symbol: string;
   }) {
+    let rpcName = options.name;
     await this.networkDisplay.click();
-    await this.addNetworkButton.click();
-    await this.addNetworkManuallyButton.click();
-
-    await this.networkName.waitFor();
-    await this.networkName.fill(options.name);
+    if (options.name === Tenderly.Mainnet.name) {
+      rpcName = options.rpcName;
+      await this.networkList.click();
+      await this.networkListEdit.click();
+    } else {
+      await this.addNetworkButton.click();
+      await this.networkName.fill(rpcName);
+    }
+    await this.addRpcDropDown.click();
+    await this.addRpcURLBtn.click();
     await this.networkRpc.fill(options.url);
-    await this.networkChainId.fill(options.chainID);
+    await this.rpcName.fill(rpcName);
+    await this.addURLBtn.click();
+    if (options.name !== Tenderly.Mainnet.name) {
+      await this.networkChainId.fill(options.chainID);
+    }
     await this.networkTicker.fill(options.symbol);
-    await this.saveBtn.click();
-    await this.switchToNetworkBtn.click();
+    await this.saveBtn.waitFor({ state: 'visible' });
+    await this.saveBtn.click({ timeout: 60000 });
   }
 
   async addPopularNetwork(options: { networkName: string }) {
@@ -72,13 +96,25 @@ export class NetworkController {
     const addBtn = this.page.getByTestId(`add-network-${options.networkName}`);
     await addBtn.click();
     await this.approveBtn.click();
-    await this.switchToNetworkBtn.click();
     await this.gotItBtn.click();
   }
 
-  async selectNetwork(options: { networkName: string }) {
-    await this.networkDisplay.click();
-    await this.networkSearch.fill(options.networkName);
-    await this.page.getByText(options.networkName).click();
+  async selectNetwork(options: {
+    name: string;
+    rpcName: string;
+    url: string;
+    chainID: string;
+    symbol: string;
+  }) {
+    const currentNetwork = await this.networkDisplay.textContent();
+    if (currentNetwork !== options.name) {
+      await this.networkDisplay.click();
+      if (options.name === Tenderly.Mainnet.name) {
+        await this.page.getByText(options.rpcName).click();
+        await this.page.getByText(options.rpcName).click();
+      } else {
+        await this.page.getByTestId(options.name).click();
+      }
+    }
   }
 }
diff --git a/test/e2e/playwright/shared/pageObjects/signup-page.ts b/test/e2e/playwright/shared/pageObjects/signup-page.ts
index e4165fc1ab89..28909f23ba20 100644
--- a/test/e2e/playwright/shared/pageObjects/signup-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/signup-page.ts
@@ -11,6 +11,10 @@ export class SignUpPage {
 
   readonly importWalletBtn: Locator;
 
+  readonly createWalletBtn: Locator;
+
+  readonly metametricsBtn: Locator;
+
   readonly confirmSecretBtn: Locator;
 
   readonly agreeBtn: Locator;
@@ -21,6 +25,8 @@ export class SignUpPage {
 
   readonly passwordConfirmTxt: Locator;
 
+  readonly createPasswordBtn: Locator;
+
   readonly agreeCheck: Locator;
 
   readonly agreeTandCCheck: Locator;
@@ -35,30 +41,42 @@ export class SignUpPage {
 
   readonly nextBtn: Locator;
 
-  readonly enableButton: Locator;
+  readonly enableBtn: Locator;
+
+  readonly secureWalletBtn: Locator;
+
+  readonly skipBackupBtn: Locator;
+
+  readonly skipSrpBackupBtn: Locator;
 
   constructor(page: Page) {
     this.page = page;
     this.getStartedBtn = page.locator('button:has-text("Get started")');
+    this.createWalletBtn = page.getByTestId('onboarding-create-wallet');
     this.importWalletBtn = page.locator(
       'button:has-text("Import an existing wallet")',
     );
     this.confirmSecretBtn = page.locator(
       'button:has-text("Confirm Secret Recovery Phrase")',
     );
+    this.metametricsBtn = page.getByTestId('metametrics-no-thanks');
     this.agreeBtn = page.locator('button:has-text("I agree")');
+    this.createPasswordBtn = page.getByTestId('create-password-wallet');
     this.noThanksBtn = page.locator('button:has-text("No thanks")');
     this.passwordTxt = page.getByTestId('create-password-new');
     this.passwordConfirmTxt = page.getByTestId('create-password-confirm');
     this.agreeCheck = page.getByTestId('create-new-vault__terms-checkbox');
     this.agreeTandCCheck = page.getByTestId('onboarding-terms-checkbox');
     this.agreePasswordTermsCheck = page.getByTestId('create-password-terms');
+    this.secureWalletBtn = page.getByTestId('secure-wallet-later');
+    this.skipBackupBtn = page.getByTestId('skip-srp-backup-popover-checkbox');
+    this.skipSrpBackupBtn = page.getByTestId('skip-srp-backup');
     this.importBtn = page.getByTestId('create-password-import');
     this.doneBtn = page.getByTestId('pin-extension-done');
     this.gotItBtn = page.getByTestId('onboarding-complete-done');
     this.nextBtn = page.getByTestId('pin-extension-next');
     this.agreeBtn = page.locator('button:has-text("I agree")');
-    this.enableButton = page.locator('button:has-text("Enable")');
+    this.enableBtn = page.locator('button:has-text("Enable")');
   }
 
   async importWallet() {
@@ -81,4 +99,20 @@ export class SignUpPage {
     await this.nextBtn.click();
     await this.doneBtn.click();
   }
+
+  async createWallet() {
+    await this.agreeTandCCheck.click();
+    await this.createWalletBtn.click();
+    await this.metametricsBtn.click();
+    await this.passwordTxt.fill(ACCOUNT_PASSWORD as string);
+    await this.passwordConfirmTxt.fill(ACCOUNT_PASSWORD as string);
+    await this.agreePasswordTermsCheck.click();
+    await this.createPasswordBtn.click();
+    await this.secureWalletBtn.click();
+    await this.skipBackupBtn.click();
+    await this.skipSrpBackupBtn.click();
+    await this.gotItBtn.click();
+    await this.nextBtn.click();
+    await this.doneBtn.click();
+  }
 }
diff --git a/test/e2e/playwright/shared/pageObjects/wallet-page.ts b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
index 47a9b667c96c..4e31441451bf 100644
--- a/test/e2e/playwright/shared/pageObjects/wallet-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
@@ -13,15 +13,31 @@ export class WalletPage {
 
   readonly tokenTab: Locator;
 
+  readonly accountMenu: Locator;
+
+  readonly addAccountButton: Locator;
+
+  readonly importAccountButton: Locator;
+
+  readonly importAccountConfirmBtn: Locator;
+
   constructor(page: Page) {
     this.page = page;
     this.swapButton = this.page.getByTestId('token-overview-button-swap');
     this.importTokensButton = this.page.getByText('Import tokens').first();
+    this.accountMenu = this.page.getByTestId('account-menu-icon');
+    this.importAccountButton = this.page.getByText('Import account');
     this.importButton = this.page.getByText('Import (');
     this.tokenTab = this.page.getByTestId('account-overview__asset-tab');
+    this.addAccountButton = this.page.getByTestId(
+      'multichain-account-menu-popover-action-button',
+    );
     this.activityListTab = this.page.getByTestId(
       'account-overview__activity-tab',
     );
+    this.importAccountConfirmBtn = this.page.getByTestId(
+      'import-account-confirm-button',
+    );
   }
 
   async importTokens() {
@@ -31,11 +47,21 @@ export class WalletPage {
     await this.importButton.click();
   }
 
+  async importAccount(accountPK: string) {
+    await this.accountMenu.waitFor({ state: 'visible' });
+    await this.accountMenu.click();
+    await this.addAccountButton.click();
+    await this.importAccountButton.click();
+    await this.page.fill('#private-key-box', accountPK);
+    await this.importAccountConfirmBtn.click();
+  }
+
   async selectTokenWallet() {
     await this.tokenTab.click();
   }
 
   async selectSwapAction() {
+    await this.swapButton.waitFor({ state: 'visible' });
     await this.swapButton.click();
   }
 
diff --git a/test/e2e/playwright/swap/pageObjects/swap-page.ts b/test/e2e/playwright/swap/pageObjects/swap-page.ts
index 094d92b0d116..c10536d37f05 100644
--- a/test/e2e/playwright/swap/pageObjects/swap-page.ts
+++ b/test/e2e/playwright/swap/pageObjects/swap-page.ts
@@ -3,6 +3,8 @@ import { type Locator, type Page } from '@playwright/test';
 export class SwapPage {
   private page: Page;
 
+  private swapQty: string;
+
   readonly toggleSmartSwap: Locator;
 
   readonly updateSettingsButton: Locator;
@@ -27,8 +29,11 @@ export class SwapPage {
 
   readonly closeButton: Locator;
 
+  readonly viewInActivityBtn: Locator;
+
   constructor(page: Page) {
     this.page = page;
+    this.swapQty = '';
     this.toggleSmartSwap = this.page.locator('text="On"');
     this.updateSettingsButton = this.page.getByTestId(
       'update-transaction-settings-button',
@@ -53,44 +58,80 @@ export class SwapPage {
     this.swapTokenButton = this.page.locator('button', { hasText: 'Swap' });
     this.closeButton = this.page.getByText('Close');
     this.backButton = this.page.locator('[title="Cancel"]');
+    this.viewInActivityBtn = this.page.getByTestId(
+      'page-container-footer-next',
+    );
   }
 
-  async fetchQuote(options: { from?: string; to: string; qty: string }) {
-    // Enter Swap Quantity
-    await this.tokenQty.fill(options.qty);
-
+  async enterQuote(options: { from?: string; to: string; qty: string }) {
     // Enter source token
-    if (options.from) {
+    const native = await this.page.$(`text=/${options.from}/`);
+    if (!native && options.from) {
       this.swapFromDropDown.click();
-      await this.tokenSearch.fill(options.from);
       await this.selectTokenFromList(options.from);
     }
 
-    // Enter destionation token
+    const balanceString = await this.page
+      .locator('[class*="balance"]')
+      .first()
+      .textContent();
+    if (balanceString) {
+      if (parseFloat(balanceString.split(' ')[1]) <= parseFloat(options.qty)) {
+        await this.goBack();
+        // not enough balance so cancel out
+        return false;
+      }
+    }
+
+    // Enter Swap Quantity
+    await this.tokenQty.fill(options.qty);
+    this.swapQty = options.qty;
+
+    // Enter destination token
     await this.swapToDropDown.click();
-    await this.tokenSearch.fill(options.to);
     await this.selectTokenFromList(options.to);
+    return true;
+  }
+
+  async waitForQuote() {
+    let quoteFound = false;
+    do {
+      // Clear Swap Anyway button if present
+      const swapAnywayButton = await this.page.$('text=/Swap anyway/');
+      if (swapAnywayButton) {
+        await swapAnywayButton.click();
+      }
+
+      // No quotes available
+      const noQuotes = await this.page.$('text=/No quotes available/');
+      if (noQuotes) {
+        await this.goBack();
+        break;
+      }
+
+      if (await this.page.$('text=/New quotes in/')) {
+        quoteFound = true;
+        break;
+      }
+      await this.page.waitForTimeout(1000);
+    } while (!quoteFound);
+
+    return quoteFound;
   }
 
   async swap() {
     await this.waitForCountDown();
-
-    // Clear Swap Anyway button if present
-    const swapAnywayButton = await this.page.$('text=/Swap anyway/');
-    if (swapAnywayButton) {
-      await swapAnywayButton.click();
-    }
     await this.swapTokenButton.click();
   }
 
-  async switchTokens() {
+  async switchTokenOrder() {
     // Wait for swap button to appear
     await this.swapTokenButton.waitFor();
     await this.switchTokensButton.click();
     await this.waitForCountDown();
   }
 
-  async gotBack() {
+  async goBack() {
     await this.backButton.click();
   }
 
@@ -98,9 +139,25 @@ export class SwapPage {
     await this.page.waitForSelector(`text=/New quotes in 0:${second}/`);
   }
 
-  async waitForTransactionToComplete() {
-    await this.page.waitForSelector('text=/Transaction complete/');
-    await this.closeButton.click(); // Close button
+  async waitForTransactionToComplete(options: { seconds: number }) {
+    let countSecond = options.seconds;
+    let transactionCompleted;
+    do {
+      transactionCompleted = await this.page.$('text=/Transaction complete/');
+      if (transactionCompleted) {
+        await this.closeButton.click();
+        break;
+      }
+
+      await this.page.waitForTimeout(1000);
+      countSecond -= 1;
+    } while (countSecond);
+
+    if (!transactionCompleted && !countSecond) {
+      await this.viewInActivityBtn.click();
+      return false;
+    }
+    return true;
   }
 
   async waitForInsufficentBalance() {
@@ -109,20 +166,10 @@ export class SwapPage {
   }
 
   async selectTokenFromList(symbol: string) {
-    let searchItem;
-    do {
-      searchItem = await this.tokenList.first().textContent();
-    } while (searchItem !== symbol);
-
-    await this.tokenList.first().click();
-  }
-
-  async waitForSearchListToPopulate(symbol: string): Promise<void> {
-    let searchItem;
-    do {
-      searchItem = await this.tokenList.first().textContent();
-    } while (searchItem !== symbol);
-
-    return await this.tokenList.first().click();
+    await this.tokenSearch.waitFor();
+    await this.tokenSearch.fill(symbol);
+    const regex = new RegExp(`^${symbol}$`, 'u');
+    const searchItem = await this.tokenList.filter({ hasText: regex });
+    await searchItem.click({ timeout: 5000 });
   }
 }
diff --git a/test/e2e/playwright/swap/specs/swap.spec.ts b/test/e2e/playwright/swap/specs/swap.spec.ts
index a795f67b2753..73a85620eabf 100644
--- a/test/e2e/playwright/swap/specs/swap.spec.ts
+++ b/test/e2e/playwright/swap/specs/swap.spec.ts
@@ -1,4 +1,6 @@
+import { ethers } from 'ethers';
 import { test } from '@playwright/test';
+import log from 'loglevel';
 
 import { ChromeExtensionPage } from '../../shared/pageObjects/extension-page';
 import { SignUpPage } from '../../shared/pageObjects/signup-page';
@@ -6,106 +8,108 @@ import { NetworkController } from '../../shared/pageObjects/network-controller-p
 import { SwapPage } from '../pageObjects/swap-page';
 import { WalletPage } from '../../shared/pageObjects/wallet-page';
 import { ActivityListPage } from '../../shared/pageObjects/activity-list-page';
+import { Tenderly, addFundsToAccount } from '../tenderly-network';
 
 let swapPage: SwapPage;
 let networkController: NetworkController;
 let walletPage: WalletPage;
 let activityListPage: ActivityListPage;
 
-const Tenderly = {
-  Mainnet: {
-    name: 'Tenderly',
-    url: 'https://rpc.tenderly.co/fork/cdbcd795-097d-4624-aa16-680374d89a43',
-    chainID: '1',
-    symbol: 'ETH',
+const testSet = [
+  {
+    quantity: '.5',
+    source: 'ETH',
+    type: 'native',
+    destination: 'DAI',
+    network: Tenderly.Mainnet,
   },
-};
+  {
+    quantity: '50',
+    source: 'DAI',
+    type: 'unapproved',
+    destination: 'ETH',
+    network: Tenderly.Mainnet,
+  },
+
+  {
+    source: 'ETH',
+    quantity: '.5',
+    type: 'native',
+    destination: 'WETH',
+    network: Tenderly.Mainnet,
+  },
+  {
+    quantity: '.3',
+    source: 'WETH',
+    type: 'wrapped',
+    destination: 'ETH',
+    network: Tenderly.Mainnet,
+  },
+  {
+    quantity: '50',
+    source: 'DAI',
+    type: 'ERC20->ERC20',
+    destination: 'USDC',
+    network: Tenderly.Mainnet,
+  },
+];
 
-test.beforeEach(
+test.beforeAll(
   'Initialize extension, import wallet and add custom networks',
   async () => {
     const extension = new ChromeExtensionPage();
     const page = await extension.initExtension();
+    page.setDefaultTimeout(15000);
+
+    const wallet = ethers.Wallet.createRandom();
+    await addFundsToAccount(Tenderly.Mainnet.url, wallet.address);
 
     const signUp = new SignUpPage(page);
-    await signUp.importWallet();
+    await signUp.createWallet();
 
     networkController = new NetworkController(page);
     swapPage = new SwapPage(page);
     activityListPage = new ActivityListPage(page);
+    walletPage = new WalletPage(page);
 
     await networkController.addCustomNetwork(Tenderly.Mainnet);
-    walletPage = new WalletPage(page);
-    await page.waitForTimeout(2000);
+    await walletPage.importAccount(wallet.privateKey);
   },
 );
 
-test('Swap ETH to DAI - Switch to Arbitrum and fetch quote - Switch ETH - WETH', async () => {
-  await walletPage.importTokens();
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ from: 'ETH', to: 'DAI', qty: '.001' });
-  await swapPage.swap();
-  await swapPage.waitForTransactionToComplete();
-  await walletPage.selectActivityList();
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap ETH to DAI',
-  });
-
-  await networkController.addPopularNetwork({ networkName: 'Arbitrum One' });
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ to: 'MATIC', qty: '.001' });
-  await swapPage.waitForInsufficentBalance();
-  await swapPage.gotBack();
+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);
+    await walletPage.selectSwapAction();
+    const quoteEntered = await swapPage.enterQuote({
+      from: options.source,
+      to: options.destination,
+      qty: options.quantity,
+    });
 
-  await networkController.selectNetwork({ networkName: 'Tenderly' });
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap ETH to DAI',
-  });
-  await walletPage.selectTokenWallet();
-  await walletPage.importTokens();
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ from: 'ETH', to: 'WETH', qty: '.001' });
-  await swapPage.swap();
-  await swapPage.waitForTransactionToComplete();
-  await walletPage.selectActivityList();
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap ETH to WETH',
-  });
-});
-
-test('Swap WETH to ETH - Switch to Avalanche and fetch quote - Switch DAI - USDC', async () => {
-  await walletPage.importTokens();
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ from: 'ETH', to: 'WETH', qty: '.001' });
-  await swapPage.swap();
-  await swapPage.waitForTransactionToComplete();
-  await walletPage.selectActivityList();
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap ETH to WETH',
-  });
-
-  await networkController.addPopularNetwork({
-    networkName: 'Avalanche Network C-Chain',
-  });
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ to: 'USDC', qty: '.001' });
-  await swapPage.waitForInsufficentBalance();
-
-  await swapPage.gotBack();
-
-  await networkController.selectNetwork({ networkName: 'Tenderly' });
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap ETH to WETH',
-  });
-  await walletPage.selectTokenWallet();
-  await walletPage.importTokens();
-  await walletPage.selectSwapAction();
-  await swapPage.fetchQuote({ from: 'DAI', to: 'USDC', qty: '.5' });
-  await swapPage.switchTokens();
-  await swapPage.swap();
-  await swapPage.waitForTransactionToComplete();
-  await walletPage.selectActivityList();
-  await activityListPage.checkActivityIsConfirmed({
-    activity: 'Swap USDC to DAI',
+    if (quoteEntered) {
+      const quoteFound = await swapPage.waitForQuote();
+      if (quoteFound) {
+        await swapPage.swap();
+        const transactionCompleted =
+          await swapPage.waitForTransactionToComplete({ seconds: 60 });
+        if (transactionCompleted) {
+          await walletPage.selectActivityList();
+          await activityListPage.checkActivityIsConfirmed({
+            activity: `Swap ${options.source} to ${options.destination}`,
+          });
+        } else {
+          log.error(`\tERROR: Transaction did not complete. Skipping test`);
+          test.skip();
+        }
+      } else {
+        log.error(`\tERROR: No quotes found on. Skipping test`);
+        test.skip();
+      }
+    } else {
+      log.error(`\tERROR: Error while entering the quote. Skipping test`);
+      test.skip();
+    }
   });
 });
diff --git a/test/e2e/playwright/swap/tenderly-network.ts b/test/e2e/playwright/swap/tenderly-network.ts
new file mode 100644
index 000000000000..996dee47a81a
--- /dev/null
+++ b/test/e2e/playwright/swap/tenderly-network.ts
@@ -0,0 +1,50 @@
+import axios from 'axios';
+import log from 'loglevel';
+
+export const Tenderly = {
+  Mainnet: {
+    name: 'Ethereum Mainnet',
+    rpcName: 'Tenderly - Mainnet',
+    url: 'https://virtual.mainnet.rpc.tenderly.co/03bb8912-7505-4856-839f-52819a26d0cd',
+    chainID: '1',
+    symbol: 'ETH',
+  },
+  Optimism: {
+    name: 'OP Mainnet',
+    rpcName: '',
+    url: 'https://virtual.optimism.rpc.tenderly.co/3170a58e-fa67-4ccc-9697-b13aff0f5c1a',
+    chainID: '10',
+    symbol: 'ETH',
+  },
+  Polygon: {
+    name: 'Polygon',
+    rpcName: '',
+    url: 'https://virtual.polygon.rpc.tenderly.co/e834a81e-69ba-49e9-a6a5-be5b6eea3cdc',
+    chainID: '137',
+    symbol: 'ETH',
+  },
+};
+
+export async function addFundsToAccount(
+  rpcURL: string,
+  account: string,
+  amount: string = '0xDE0B6B3A7640000', // 1 ETH by default
+) {
+  const data = {
+    jsonrpc: '2.0',
+    method: 'tenderly_setBalance',
+    params: [[account], amount],
+    id: '1234',
+  };
+  const response = await axios.post(rpcURL, data, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+
+  if (response.data.error) {
+    log.error(
+      `\tERROR: RROR: Failed to add funds to Tenderly VirtualTestNet\n${response.data.error}`,
+    );
+  }
+}

From 0be3a411ba1569173ba19a2349bb00408a3aaaaf Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Tue, 12 Nov 2024 12:44:31 -0800
Subject: [PATCH 079/111] chore: limit bridge quote request frequency and
 cancel requests (#27237)
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
- fetch-with-timeout.ts: accept additional abort signals as arguments
and apply them
- reset bridge state on page load and unload
- reset quotes when inputs change
- abort getQuote requests when inputs change or when page loads/unloads
- limit quote refreshes based on feature flag

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

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1448

## **Manual testing steps**

1. Request bridge quotes
2. Click "Switch" button and verify that new quotes with updated params
are requested/shown
3. Verify that bridge parameters are reset when extension is reopened
4. Verify that requests are cancelled in the background when the inputs
are updated
5. Quotes should only be fetched once if `srcAmount > balance`

## **Screenshots/Recordings**

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

### **Before**

N/A

### **After**



https://github.com/user-attachments/assets/acb927af-b04e-46cb-9b93-e2cdeb219722



## **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         |   1 +
 .../bridge/bridge-controller.test.ts          | 180 ++++++++++++++++--
 .../controllers/bridge/bridge-controller.ts   | 100 +++++++++-
 app/scripts/controllers/bridge/constants.ts   |   1 +
 app/scripts/controllers/bridge/types.ts       |  17 +-
 app/scripts/metamask-controller.js            |  10 +-
 shared/modules/bridge-utils/balance.test.ts   | 138 ++++++++++++++
 shared/modules/bridge-utils/balance.ts        |  53 ++++++
 shared/modules/fetch-with-timeout.test.ts     |  17 ++
 shared/modules/fetch-with-timeout.ts          |  17 +-
 test/e2e/tests/metrics/errors.spec.js         |   1 +
 ...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 |  17 --
 ui/ducks/bridge/actions.ts                    |   7 +
 ui/ducks/bridge/bridge.test.ts                |  32 ++++
 ui/ducks/bridge/selectors.test.ts             |  79 ++++++++
 ui/ducks/bridge/selectors.ts                  |  49 +++--
 ui/hooks/bridge/useCountdownTimer.test.ts     |  16 +-
 ui/hooks/bridge/useCountdownTimer.ts          |  14 +-
 ui/hooks/bridge/useLatestBalance.test.ts      |   2 +-
 ui/hooks/bridge/useLatestBalance.ts           |  33 ++--
 ui/pages/bridge/bridge.util.test.ts           |  69 ++++---
 ui/pages/bridge/bridge.util.ts                |   7 +-
 ui/pages/bridge/index.test.tsx                |   3 +
 ui/pages/bridge/index.tsx                     |  19 +-
 .../prepare/prepare-bridge-page.test.tsx      |  15 +-
 .../bridge/prepare/prepare-bridge-page.tsx    |  16 +-
 .../bridge/quotes/bridge-quote-card.test.tsx  |   5 +
 ui/pages/bridge/quotes/bridge-quote-card.tsx  |   4 +-
 30 files changed, 802 insertions(+), 122 deletions(-)
 create mode 100644 shared/modules/bridge-utils/balance.test.ts
 create mode 100644 shared/modules/bridge-utils/balance.ts

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 655851590441..6f960a496b3d 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -119,6 +119,7 @@ export const SENTRY_BACKGROUND_STATE = {
       quotes: [],
       quotesLastFetched: true,
       quotesLoadingStatus: true,
+      quotesRefreshCount: true,
     },
   },
   CronjobController: {
diff --git a/app/scripts/controllers/bridge/bridge-controller.test.ts b/app/scripts/controllers/bridge/bridge-controller.test.ts
index 35449cb40764..07224ae43c2e 100644
--- a/app/scripts/controllers/bridge/bridge-controller.test.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.test.ts
@@ -6,6 +6,7 @@ import { flushPromises } from '../../../../test/lib/timer-helpers';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import * as bridgeUtil from '../../../../ui/pages/bridge/bridge.util';
+import * as balanceUtils from '../../../../shared/modules/bridge-utils/balance';
 import BridgeController from './bridge-controller';
 import { BridgeControllerMessenger } from './types';
 import { DEFAULT_BRIDGE_CONTROLLER_STATE } from './constants';
@@ -37,7 +38,7 @@ describe('BridgeController', function () {
       .reply(200, {
         'extension-config': {
           refreshRate: 3,
-          maxRefreshCount: 1,
+          maxRefreshCount: 3,
         },
         'extension-support': true,
         'src-network-allowlist': [10, 534352],
@@ -78,7 +79,7 @@ describe('BridgeController', function () {
       destNetworkAllowlist: [CHAIN_IDS.POLYGON, CHAIN_IDS.ARBITRUM],
       srcNetworkAllowlist: [CHAIN_IDS.OPTIMISM, CHAIN_IDS.SCROLL],
       extensionConfig: {
-        maxRefreshCount: 1,
+        maxRefreshCount: 3,
         refreshRate: 3,
       },
     };
@@ -236,7 +237,13 @@ describe('BridgeController', function () {
       bridgeController,
       'startPollingByNetworkClientId',
     );
-    messengerMock.call.mockReturnValue({ address: '0x123' } as never);
+    const hasSufficientBalanceSpy = jest
+      .spyOn(balanceUtils, 'hasSufficientBalance')
+      .mockResolvedValue(true);
+    messengerMock.call.mockReturnValue({
+      address: '0x123',
+      provider: jest.fn(),
+    } as never);
 
     const fetchBridgeQuotesSpy = jest
       .spyOn(bridgeUtil, 'fetchBridgeQuotes')
@@ -276,13 +283,17 @@ describe('BridgeController', function () {
       slippage: 0.5,
       walletAddress: '0x123',
     };
-    bridgeController.updateBridgeQuoteRequestParams(quoteParams);
+    await bridgeController.updateBridgeQuoteRequestParams(quoteParams);
 
     expect(stopAllPollingSpy).toHaveBeenCalledTimes(1);
     expect(startPollingByNetworkClientIdSpy).toHaveBeenCalledTimes(1);
+    expect(hasSufficientBalanceSpy).toHaveBeenCalledTimes(1);
     expect(startPollingByNetworkClientIdSpy).toHaveBeenCalledWith(
-      '1',
-      quoteRequest,
+      expect.anything(),
+      {
+        ...quoteRequest,
+        insufficientBal: false,
+      },
     );
 
     expect(bridgeController.state.bridgeState).toStrictEqual(
@@ -299,14 +310,20 @@ describe('BridgeController', function () {
     jest.advanceTimersByTime(1000);
     await flushPromises();
     expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(1);
-    expect(fetchBridgeQuotesSpy).toHaveBeenCalledWith(quoteRequest);
+    expect(fetchBridgeQuotesSpy).toHaveBeenCalledWith(
+      {
+        ...quoteRequest,
+        insufficientBal: false,
+      },
+      expect.any(AbortSignal),
+    );
+    expect(bridgeController.state.bridgeState.quotesLastFetched).toStrictEqual(
+      undefined,
+    );
 
-    const firstFetchTime =
-      bridgeController.state.bridgeState.quotesLastFetched ?? 0;
-    expect(firstFetchTime).toBeGreaterThan(0);
     expect(bridgeController.state.bridgeState).toEqual(
       expect.objectContaining({
-        quoteRequest: { ...quoteRequest, walletAddress: undefined },
+        quoteRequest: { ...quoteRequest, insufficientBal: false },
         quotes: [],
         quotesLoadingStatus: 0,
       }),
@@ -317,26 +334,27 @@ describe('BridgeController', function () {
     await flushPromises();
     expect(bridgeController.state.bridgeState).toEqual(
       expect.objectContaining({
-        quoteRequest: { ...quoteRequest, walletAddress: undefined },
+        quoteRequest: { ...quoteRequest, insufficientBal: false },
         quotes: [1, 2, 3],
         quotesLoadingStatus: 1,
       }),
     );
-    expect(bridgeController.state.bridgeState.quotesLastFetched).toStrictEqual(
-      firstFetchTime,
-    );
+    const firstFetchTime =
+      bridgeController.state.bridgeState.quotesLastFetched ?? 0;
+    expect(firstFetchTime).toBeGreaterThan(0);
 
     // After 2nd fetch
     jest.advanceTimersByTime(50000);
     await flushPromises();
-    expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(2);
     expect(bridgeController.state.bridgeState).toEqual(
       expect.objectContaining({
-        quoteRequest: { ...quoteRequest, walletAddress: undefined },
+        quoteRequest: { ...quoteRequest, insufficientBal: false },
         quotes: [5, 6, 7],
         quotesLoadingStatus: 1,
+        quotesRefreshCount: 2,
       }),
     );
+    expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(2);
     const secondFetchTime =
       bridgeController.state.bridgeState.quotesLastFetched;
     expect(secondFetchTime).toBeGreaterThan(firstFetchTime);
@@ -347,14 +365,140 @@ describe('BridgeController', function () {
     expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(3);
     expect(bridgeController.state.bridgeState).toEqual(
       expect.objectContaining({
-        quoteRequest: { ...quoteRequest, walletAddress: undefined },
+        quoteRequest: { ...quoteRequest, insufficientBal: false },
         quotes: [5, 6, 7],
         quotesLoadingStatus: 2,
+        quotesRefreshCount: 3,
       }),
     );
     expect(bridgeController.state.bridgeState.quotesLastFetched).toStrictEqual(
       secondFetchTime,
     );
+
+    expect(hasSufficientBalanceSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('updateBridgeQuoteRequestParams should only poll once if insufficientBal=true', async function () {
+    jest.useFakeTimers();
+    const stopAllPollingSpy = jest.spyOn(bridgeController, 'stopAllPolling');
+    const startPollingByNetworkClientIdSpy = jest.spyOn(
+      bridgeController,
+      'startPollingByNetworkClientId',
+    );
+    const hasSufficientBalanceSpy = jest
+      .spyOn(balanceUtils, 'hasSufficientBalance')
+      .mockResolvedValue(false);
+    messengerMock.call.mockReturnValue({
+      address: '0x123',
+      provider: jest.fn(),
+    } as never);
+
+    const fetchBridgeQuotesSpy = jest
+      .spyOn(bridgeUtil, 'fetchBridgeQuotes')
+      .mockImplementationOnce(async () => {
+        return await new Promise((resolve) => {
+          return setTimeout(() => {
+            resolve([1, 2, 3] as never);
+          }, 5000);
+        });
+      });
+
+    fetchBridgeQuotesSpy.mockImplementation(async () => {
+      return await new Promise((resolve) => {
+        return setTimeout(() => {
+          resolve([5, 6, 7] as never);
+        }, 10000);
+      });
+    });
+
+    const quoteParams = {
+      srcChainId: 1,
+      destChainId: 10,
+      srcTokenAddress: '0x0000000000000000000000000000000000000000',
+      destTokenAddress: '0x123',
+      srcTokenAmount: '1000000000000000000',
+    };
+    const quoteRequest = {
+      ...quoteParams,
+      slippage: 0.5,
+      walletAddress: '0x123',
+    };
+    await bridgeController.updateBridgeQuoteRequestParams(quoteParams);
+
+    expect(stopAllPollingSpy).toHaveBeenCalledTimes(1);
+    expect(startPollingByNetworkClientIdSpy).toHaveBeenCalledTimes(1);
+    expect(hasSufficientBalanceSpy).toHaveBeenCalledTimes(1);
+    expect(startPollingByNetworkClientIdSpy).toHaveBeenCalledWith(
+      expect.anything(),
+      {
+        ...quoteRequest,
+        insufficientBal: true,
+      },
+    );
+
+    expect(bridgeController.state.bridgeState).toStrictEqual(
+      expect.objectContaining({
+        quoteRequest: { ...quoteRequest, walletAddress: undefined },
+        quotes: DEFAULT_BRIDGE_CONTROLLER_STATE.quotes,
+        quotesLastFetched: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLastFetched,
+        quotesLoadingStatus:
+          DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLoadingStatus,
+      }),
+    );
+
+    // Loading state
+    jest.advanceTimersByTime(1000);
+    await flushPromises();
+    expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(1);
+    expect(fetchBridgeQuotesSpy).toHaveBeenCalledWith(
+      {
+        ...quoteRequest,
+        insufficientBal: true,
+      },
+      expect.any(AbortSignal),
+    );
+    expect(bridgeController.state.bridgeState.quotesLastFetched).toStrictEqual(
+      undefined,
+    );
+
+    expect(bridgeController.state.bridgeState).toEqual(
+      expect.objectContaining({
+        quoteRequest: { ...quoteRequest, insufficientBal: true },
+        quotes: [],
+        quotesLoadingStatus: 0,
+      }),
+    );
+
+    // After first fetch
+    jest.advanceTimersByTime(10000);
+    await flushPromises();
+    expect(bridgeController.state.bridgeState).toEqual(
+      expect.objectContaining({
+        quoteRequest: { ...quoteRequest, insufficientBal: true },
+        quotes: [1, 2, 3],
+        quotesLoadingStatus: 1,
+        quotesRefreshCount: 1,
+      }),
+    );
+    const firstFetchTime =
+      bridgeController.state.bridgeState.quotesLastFetched ?? 0;
+    expect(firstFetchTime).toBeGreaterThan(0);
+
+    // After 2nd fetch
+    jest.advanceTimersByTime(50000);
+    await flushPromises();
+    expect(fetchBridgeQuotesSpy).toHaveBeenCalledTimes(1);
+    expect(bridgeController.state.bridgeState).toEqual(
+      expect.objectContaining({
+        quoteRequest: { ...quoteRequest, insufficientBal: true },
+        quotes: [1, 2, 3],
+        quotesLoadingStatus: 1,
+        quotesRefreshCount: 1,
+      }),
+    );
+    const secondFetchTime =
+      bridgeController.state.bridgeState.quotesLastFetched;
+    expect(secondFetchTime).toStrictEqual(firstFetchTime);
   });
 
   it('updateBridgeQuoteRequestParams should not trigger quote polling if request is invalid', function () {
diff --git a/app/scripts/controllers/bridge/bridge-controller.ts b/app/scripts/controllers/bridge/bridge-controller.ts
index 1d20e6f404e4..00d28b044457 100644
--- a/app/scripts/controllers/bridge/bridge-controller.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.ts
@@ -1,5 +1,5 @@
 import { StateMetadata } from '@metamask/base-controller';
-import { Hex } from '@metamask/utils';
+import { add0x, Hex } from '@metamask/utils';
 import { StaticIntervalPollingController } from '@metamask/polling-controller';
 import { NetworkClientId } from '@metamask/network-controller';
 import {
@@ -19,6 +19,7 @@ import { QuoteRequest } from '../../../../ui/pages/bridge/types';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { isValidQuoteRequest } from '../../../../ui/pages/bridge/utils/quote';
+import { hasSufficientBalance } from '../../../../shared/modules/bridge-utils/balance';
 import {
   BRIDGE_CONTROLLER_NAME,
   DEFAULT_BRIDGE_CONTROLLER_STATE,
@@ -38,11 +39,15 @@ const metadata: StateMetadata<{ bridgeState: BridgeControllerState }> = {
   },
 };
 
+const RESET_STATE_ABORT_MESSAGE = 'Reset controller state';
+
 export default class BridgeController extends StaticIntervalPollingController<
   typeof BRIDGE_CONTROLLER_NAME,
   { bridgeState: BridgeControllerState },
   BridgeControllerMessenger
 > {
+  #abortController: AbortController | undefined;
+
   constructor({ messenger }: { messenger: BridgeControllerMessenger }) {
     super({
       name: BRIDGE_CONTROLLER_NAME,
@@ -71,6 +76,10 @@ export default class BridgeController extends StaticIntervalPollingController<
       `${BRIDGE_CONTROLLER_NAME}:updateBridgeQuoteRequestParams`,
       this.updateBridgeQuoteRequestParams.bind(this),
     );
+    this.messagingSystem.registerActionHandler(
+      `${BRIDGE_CONTROLLER_NAME}:resetState`,
+      this.resetState.bind(this),
+    );
   }
 
   _executePoll = async (
@@ -80,8 +89,12 @@ export default class BridgeController extends StaticIntervalPollingController<
     await this.#fetchBridgeQuotes(updatedQuoteRequest);
   };
 
-  updateBridgeQuoteRequestParams = (paramsToUpdate: Partial<QuoteRequest>) => {
+  updateBridgeQuoteRequestParams = async (
+    paramsToUpdate: Partial<QuoteRequest>,
+  ) => {
     this.stopAllPolling();
+    this.#abortController?.abort('Quote request updated');
+
     const { bridgeState } = this.state;
     const updatedQuoteRequest = {
       ...DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
@@ -96,23 +109,52 @@ export default class BridgeController extends StaticIntervalPollingController<
         quotesLastFetched: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLastFetched,
         quotesLoadingStatus:
           DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLoadingStatus,
+        quotesRefreshCount: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesRefreshCount,
       };
     });
 
     if (isValidQuoteRequest(updatedQuoteRequest)) {
       const walletAddress = this.#getSelectedAccount().address;
-      this.startPollingByNetworkClientId(
+      const srcChainIdInHex = add0x(
         decimalToHex(updatedQuoteRequest.srcChainId),
-        { ...updatedQuoteRequest, walletAddress },
       );
+
+      const insufficientBal =
+        paramsToUpdate.insufficientBal ||
+        !(await this.#hasSufficientBalance(updatedQuoteRequest));
+
+      const networkClientId = this.#getSelectedNetworkClientId(srcChainIdInHex);
+      this.startPollingByNetworkClientId(networkClientId, {
+        ...updatedQuoteRequest,
+        walletAddress,
+        insufficientBal,
+      });
     }
   };
 
+  #hasSufficientBalance = async (quoteRequest: QuoteRequest) => {
+    const walletAddress = this.#getSelectedAccount().address;
+    const srcChainIdInHex = add0x(decimalToHex(quoteRequest.srcChainId));
+    const provider = this.#getSelectedNetworkClient()?.provider;
+
+    return (
+      provider &&
+      (await hasSufficientBalance(
+        provider,
+        walletAddress,
+        quoteRequest.srcTokenAddress,
+        quoteRequest.srcTokenAmount,
+        srcChainIdInHex,
+      ))
+    );
+  };
+
   resetState = () => {
     this.stopAllPolling();
+    this.#abortController?.abort(RESET_STATE_ABORT_MESSAGE);
+
     this.update((_state) => {
       _state.bridgeState = {
-        ..._state.bridgeState,
         ...DEFAULT_BRIDGE_CONTROLLER_STATE,
         quotes: [],
         bridgeFeatureFlags: _state.bridgeState.bridgeFeatureFlags,
@@ -142,32 +184,61 @@ export default class BridgeController extends StaticIntervalPollingController<
   };
 
   #fetchBridgeQuotes = async (request: QuoteRequest) => {
+    this.#abortController?.abort('New quote request');
+    this.#abortController = new AbortController();
+    if (request.srcChainId === request.destChainId) {
+      return;
+    }
     const { bridgeState } = this.state;
     this.update((_state) => {
       _state.bridgeState = {
         ...bridgeState,
-        quotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.LOADING,
+        quoteRequest: request,
       };
     });
+    const { maxRefreshCount } =
+      bridgeState.bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG];
+    const newQuotesRefreshCount = bridgeState.quotesRefreshCount + 1;
 
     try {
-      const quotes = await fetchBridgeQuotes(request);
+      const quotes = await fetchBridgeQuotes(
+        request,
+        this.#abortController.signal,
+      );
+
+      // Stop polling if the maximum number of refreshes has been reached
+      if (
+        (request.insufficientBal && newQuotesRefreshCount >= 1) ||
+        (!request.insufficientBal && newQuotesRefreshCount >= maxRefreshCount)
+      ) {
+        this.stopAllPolling();
+      }
+
       this.update((_state) => {
         _state.bridgeState = {
           ..._state.bridgeState,
           quotes,
+          quotesLastFetched: Date.now(),
           quotesLoadingStatus: RequestStatus.FETCHED,
+          quotesRefreshCount: newQuotesRefreshCount,
         };
       });
     } catch (error) {
-      console.log('Failed to fetch bridge quotes', error);
+      const isAbortError = (error as Error).name === 'AbortError';
+      const isAbortedDueToReset = error === RESET_STATE_ABORT_MESSAGE;
+      if (isAbortedDueToReset || isAbortError) {
+        return;
+      }
+
       this.update((_state) => {
         _state.bridgeState = {
           ...bridgeState,
           quotesLoadingStatus: RequestStatus.ERROR,
+          quotesRefreshCount: newQuotesRefreshCount,
         };
       });
+      console.log('Failed to fetch bridge quotes', error);
     }
   };
 
@@ -193,4 +264,17 @@ export default class BridgeController extends StaticIntervalPollingController<
   #getSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
   }
+
+  #getSelectedNetworkClient() {
+    return this.messagingSystem.call(
+      'NetworkController:getSelectedNetworkClient',
+    );
+  }
+
+  #getSelectedNetworkClientId(chainId: Hex) {
+    return this.messagingSystem.call(
+      'NetworkController:findNetworkClientIdByChainId',
+      chainId,
+    );
+  }
 }
diff --git a/app/scripts/controllers/bridge/constants.ts b/app/scripts/controllers/bridge/constants.ts
index a4aa3264fdc8..aa2d74f0a08e 100644
--- a/app/scripts/controllers/bridge/constants.ts
+++ b/app/scripts/controllers/bridge/constants.ts
@@ -34,4 +34,5 @@ export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
   quotes: [],
   quotesLastFetched: undefined,
   quotesLoadingStatus: undefined,
+  quotesRefreshCount: 0,
 };
diff --git a/app/scripts/controllers/bridge/types.ts b/app/scripts/controllers/bridge/types.ts
index 10c2d8646545..2ab9ef8e7a37 100644
--- a/app/scripts/controllers/bridge/types.ts
+++ b/app/scripts/controllers/bridge/types.ts
@@ -4,6 +4,10 @@ import {
 } from '@metamask/base-controller';
 import { Hex } from '@metamask/utils';
 import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
+import {
+  NetworkControllerFindNetworkClientIdByChainIdAction,
+  NetworkControllerGetSelectedNetworkClientAction,
+} from '@metamask/network-controller';
 import { SwapsTokenObject } from '../../../../shared/constants/swaps';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
@@ -38,6 +42,7 @@ export type BridgeControllerState = {
   quotes: QuoteResponse[];
   quotesLastFetched?: number;
   quotesLoadingStatus?: RequestStatus;
+  quotesRefreshCount: number;
 };
 
 export enum BridgeUserAction {
@@ -47,6 +52,7 @@ export enum BridgeUserAction {
 }
 export enum BridgeBackgroundAction {
   SET_FEATURE_FLAGS = 'setBridgeFeatureFlags',
+  RESET_STATE = 'resetState',
 }
 
 type BridgeControllerAction<FunctionName extends keyof BridgeController> = {
@@ -57,6 +63,7 @@ type BridgeControllerAction<FunctionName extends keyof BridgeController> = {
 // Maps to BridgeController function names
 type BridgeControllerActions =
   | BridgeControllerAction<BridgeBackgroundAction.SET_FEATURE_FLAGS>
+  | BridgeControllerAction<BridgeBackgroundAction.RESET_STATE>
   | BridgeControllerAction<BridgeUserAction.SELECT_SRC_NETWORK>
   | BridgeControllerAction<BridgeUserAction.SELECT_DEST_NETWORK>
   | BridgeControllerAction<BridgeUserAction.UPDATE_QUOTE_PARAMS>;
@@ -66,7 +73,10 @@ type BridgeControllerEvents = ControllerStateChangeEvent<
   BridgeControllerState
 >;
 
-type AllowedActions = AccountsControllerGetSelectedAccountAction['type'];
+type AllowedActions =
+  | AccountsControllerGetSelectedAccountAction['type']
+  | NetworkControllerGetSelectedNetworkClientAction['type']
+  | NetworkControllerFindNetworkClientIdByChainIdAction['type'];
 type AllowedEvents = never;
 
 /**
@@ -74,7 +84,10 @@ type AllowedEvents = never;
  */
 export type BridgeControllerMessenger = RestrictedControllerMessenger<
   typeof BRIDGE_CONTROLLER_NAME,
-  BridgeControllerActions | AccountsControllerGetSelectedAccountAction,
+  | BridgeControllerActions
+  | AccountsControllerGetSelectedAccountAction
+  | NetworkControllerGetSelectedNetworkClientAction
+  | NetworkControllerFindNetworkClientIdByChainIdAction,
   BridgeControllerEvents,
   AllowedActions,
   AllowedEvents
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a49e286af752..9632e072c70b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2129,7 +2129,11 @@ export default class MetamaskController extends EventEmitter {
 
     const bridgeControllerMessenger = this.controllerMessenger.getRestricted({
       name: BRIDGE_CONTROLLER_NAME,
-      allowedActions: ['AccountsController:getSelectedAccount'],
+      allowedActions: [
+        'AccountsController:getSelectedAccount',
+        'NetworkController:getSelectedNetworkClient',
+        'NetworkController:findNetworkClientIdByChainId',
+      ],
       allowedEvents: [],
     });
     this.bridgeController = new BridgeController({
@@ -3943,6 +3947,10 @@ export default class MetamaskController extends EventEmitter {
           this.controllerMessenger,
           `${BRIDGE_CONTROLLER_NAME}:${BridgeBackgroundAction.SET_FEATURE_FLAGS}`,
         ),
+      [BridgeBackgroundAction.RESET_STATE]: this.controllerMessenger.call.bind(
+        this.controllerMessenger,
+        `${BRIDGE_CONTROLLER_NAME}:${BridgeBackgroundAction.RESET_STATE}`,
+      ),
       [BridgeUserAction.SELECT_SRC_NETWORK]: this.controllerMessenger.call.bind(
         this.controllerMessenger,
         `${BRIDGE_CONTROLLER_NAME}:${BridgeUserAction.SELECT_SRC_NETWORK}`,
diff --git a/shared/modules/bridge-utils/balance.test.ts b/shared/modules/bridge-utils/balance.test.ts
new file mode 100644
index 000000000000..15cf1f246c8b
--- /dev/null
+++ b/shared/modules/bridge-utils/balance.test.ts
@@ -0,0 +1,138 @@
+import { BigNumber } from 'ethers';
+import { zeroAddress } from 'ethereumjs-util';
+import { createTestProviderTools } from '../../../test/stub/provider';
+import { CHAIN_IDS } from '../../constants/network';
+import { Numeric } from '../Numeric';
+import * as tokenutil from '../../lib/token-util';
+import { calcLatestSrcBalance, hasSufficientBalance } from './balance';
+
+const mockGetBalance = jest.fn();
+jest.mock('@ethersproject/providers', () => {
+  return {
+    Web3Provider: jest.fn().mockImplementation(() => {
+      return {
+        getBalance: mockGetBalance,
+      };
+    }),
+  };
+});
+
+describe('balance', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    const { provider } = createTestProviderTools({
+      networkId: 'Ethereum',
+      chainId: CHAIN_IDS.MAINNET,
+    });
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    global.ethereumProvider = provider as any;
+  });
+
+  describe('calcLatestSrcBalance', () => {
+    it('should return the ERC20 token balance', async () => {
+      const mockFetchTokenBalance = jest.spyOn(tokenutil, 'fetchTokenBalance');
+      mockFetchTokenBalance.mockResolvedValueOnce(BigNumber.from('100'));
+
+      expect(
+        await calcLatestSrcBalance(
+          global.ethereumProvider,
+          '0x123',
+          '0x456',
+          '0x789',
+        ),
+      ).toStrictEqual(Numeric.from(100, 10));
+      expect(mockFetchTokenBalance).toHaveBeenCalledTimes(1);
+      expect(mockFetchTokenBalance).toHaveBeenCalledWith(
+        '0x456',
+        '0x123',
+        global.ethereumProvider,
+      );
+    });
+
+    it('should return the native asset balance', async () => {
+      mockGetBalance.mockImplementation(() => {
+        return BigNumber.from(100);
+      });
+
+      expect(
+        await calcLatestSrcBalance(
+          global.ethereumProvider,
+          '0x141d32a89a1e0a5Ef360034a2f60a4B917c18838',
+          zeroAddress(),
+          '0x789',
+        ),
+      ).toStrictEqual(Numeric.from(100, 10));
+      expect(mockGetBalance).toHaveBeenCalledTimes(1);
+      expect(mockGetBalance).toHaveBeenCalledWith(
+        '0x141d32a89a1e0a5Ef360034a2f60a4B917c18838',
+      );
+    });
+
+    it('should return undefined if token address and chainId are undefined', async () => {
+      const mockFetchTokenBalance = jest.spyOn(tokenutil, 'fetchTokenBalance');
+      expect(
+        await calcLatestSrcBalance(
+          global.ethereumProvider,
+          '0x141d32a89a1e0a5Ef360034a2f60a4B917c18838',
+          undefined as never,
+          undefined as never,
+        ),
+      ).toStrictEqual(undefined);
+      expect(mockFetchTokenBalance).not.toHaveBeenCalled();
+      expect(mockGetBalance).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('hasSufficientBalance', () => {
+    it('should return true if user has sufficient balance', async () => {
+      mockGetBalance.mockImplementation(() => {
+        return BigNumber.from('10000000000000000000');
+      });
+      const mockFetchTokenBalance = jest.spyOn(tokenutil, 'fetchTokenBalance');
+      mockFetchTokenBalance.mockResolvedValueOnce(
+        BigNumber.from('10000000000000000001'),
+      );
+
+      expect(
+        await hasSufficientBalance(
+          global.ethereumProvider,
+          '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+          zeroAddress(),
+          '10000000000000000000',
+          '0x1',
+        ),
+      ).toBe(true);
+
+      expect(
+        await hasSufficientBalance(
+          global.ethereumProvider,
+          '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+          '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
+          '10000000000000000000',
+          '0x1',
+        ),
+      ).toBe(true);
+    });
+
+    it('should return false if user has native assets but insufficient ERC20 src tokens', async () => {
+      mockGetBalance.mockImplementation(() => {
+        return BigNumber.from('10000000000000000000');
+      });
+      const mockFetchTokenBalance = jest.spyOn(tokenutil, 'fetchTokenBalance');
+      mockFetchTokenBalance.mockResolvedValueOnce(
+        BigNumber.from('9000000000000000000'),
+      );
+
+      expect(
+        await hasSufficientBalance(
+          global.ethereumProvider,
+          '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+          '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
+          '10000000000000000000',
+          '0x1',
+        ),
+      ).toBe(false);
+    });
+  });
+});
diff --git a/shared/modules/bridge-utils/balance.ts b/shared/modules/bridge-utils/balance.ts
new file mode 100644
index 000000000000..2ba5834d8df9
--- /dev/null
+++ b/shared/modules/bridge-utils/balance.ts
@@ -0,0 +1,53 @@
+import { Web3Provider } from '@ethersproject/providers';
+import { Hex } from '@metamask/utils';
+import { zeroAddress } from 'ethereumjs-util';
+import { getAddress } from 'ethers/lib/utils';
+import { HttpProvider } from '../../../types/global';
+import { fetchTokenBalance } from '../../lib/token-util';
+import { Numeric } from '../Numeric';
+
+export const calcLatestSrcBalance = async (
+  provider: HttpProvider,
+  selectedAddress: string,
+  tokenAddress: string,
+  chainId: Hex,
+): Promise<Numeric | undefined> => {
+  if (tokenAddress && chainId) {
+    if (tokenAddress === zeroAddress()) {
+      const ethersProvider = new Web3Provider(provider);
+      return Numeric.from(
+        (
+          await ethersProvider.getBalance(getAddress(selectedAddress))
+        ).toString(),
+        10,
+      );
+    }
+    return Numeric.from(
+      (
+        await fetchTokenBalance(tokenAddress, selectedAddress, provider)
+      ).toString(),
+      10,
+    );
+  }
+  return undefined;
+};
+
+export const hasSufficientBalance = async (
+  provider: unknown,
+  selectedAddress: string,
+  tokenAddress: string,
+  fromTokenAmount: string,
+  chainId: Hex,
+) => {
+  const srcTokenBalance = await calcLatestSrcBalance(
+    provider as HttpProvider,
+    selectedAddress,
+    tokenAddress,
+    chainId,
+  );
+
+  return (
+    srcTokenBalance?.greaterThanOrEqualTo(Numeric.from(fromTokenAmount, 10)) ??
+    false
+  );
+};
diff --git a/shared/modules/fetch-with-timeout.test.ts b/shared/modules/fetch-with-timeout.test.ts
index 2129db1c30fa..11ccd145488e 100644
--- a/shared/modules/fetch-with-timeout.test.ts
+++ b/shared/modules/fetch-with-timeout.test.ts
@@ -45,6 +45,23 @@ describe('getFetchWithTimeout', () => {
     }).rejects.toThrow('The user aborted a request.');
   });
 
+  it('should abort the request when a custom signal aborts', async () => {
+    nock('https://api.infura.io')
+      .get('/moon')
+      .delay(SECOND * 2)
+      .reply(200, '{"moon": "2012-12-21T11:11:11Z"}');
+    const abortSignal = new window.AbortController();
+
+    const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+
+    setTimeout(() => abortSignal.abort('Request aborted'), SECOND * 2);
+    await expect(async () => {
+      await fetchWithTimeout('https://api.infura.io/moon', {
+        signal: abortSignal.signal,
+      }).then((r) => r.json());
+    }).rejects.toThrow('The user aborted a request.');
+  });
+
   it('throws on invalid timeout', async () => {
     await expect(() => getFetchWithTimeout(-1)).toThrow(
       'Must specify positive integer timeout.',
diff --git a/shared/modules/fetch-with-timeout.ts b/shared/modules/fetch-with-timeout.ts
index f5c6d5384012..f6caedd4afa5 100644
--- a/shared/modules/fetch-with-timeout.ts
+++ b/shared/modules/fetch-with-timeout.ts
@@ -21,10 +21,20 @@ const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
     opts?: RequestInit,
   ): Promise<Response> {
     const abortController = new window.AbortController();
-    const { signal } = abortController;
+
+    // Add the provided signal to the list of signals that can abort the request
+    const abortSignals = [abortController.signal];
+    if (opts?.signal) {
+      abortSignals.push(opts.signal);
+    }
+
+    const combinedAbortController = new AbortController();
+    const abortHandler = () => combinedAbortController.abort();
+    abortSignals.forEach((sig) => sig.addEventListener('abort', abortHandler));
+
     const f = window.fetch(url, {
       ...opts,
-      signal,
+      signal: combinedAbortController.signal,
     });
 
     const timer = setTimeout(() => abortController.abort(), timeout);
@@ -33,6 +43,9 @@ const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
       return await f;
     } finally {
       clearTimeout(timer);
+      abortSignals.forEach((sig) =>
+        sig.removeEventListener('abort', abortHandler),
+      );
     }
   };
 });
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index d4c27a87aba6..b35a38d83206 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -876,6 +876,7 @@ describe('Sentry errors', function () {
         },
         quotesLastFetched: true,
         quotesLoadingStatus: true,
+        quotesRefreshCount: true,
       },
       currentPopupId: false, // Initialized as undefined
       // Part of transaction controller store, but missing from the initial
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 cebacab2b1d9..bb1640d99365 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
@@ -74,6 +74,7 @@
         "srcTokenAddress": "0x0000000000000000000000000000000000000000"
       },
       "quotes": {},
+      "quotesRefreshCount": 0,
       "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 97399d34c508..3d36d5fc7592 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
@@ -280,6 +280,7 @@
         "srcTokenAddress": "0x0000000000000000000000000000000000000000"
       },
       "quotes": {},
+      "quotesRefreshCount": 0,
       "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 7622ad15937c..fa1a00cbe4ef 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
@@ -50,23 +50,6 @@
       },
       "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": {
diff --git a/ui/ducks/bridge/actions.ts b/ui/ducks/bridge/actions.ts
index c3854bdc4ae8..f045c0dfbc12 100644
--- a/ui/ducks/bridge/actions.ts
+++ b/ui/ducks/bridge/actions.ts
@@ -49,6 +49,13 @@ export const setBridgeFeatureFlags = () => {
   };
 };
 
+export const resetBridgeState = () => {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    dispatch(resetInputFields());
+    dispatch(callBridgeControllerMethod(BridgeBackgroundAction.RESET_STATE));
+  };
+};
+
 // User actions
 export const setFromChain = (chainId: Hex) => {
   return async (dispatch: MetaMaskReduxDispatch) => {
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index 6b85565c6143..dc9596fcafba 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -21,6 +21,7 @@ import {
   resetInputFields,
   setToChainId,
   updateQuoteRequestParams,
+  resetBridgeState,
 } from './actions';
 
 const middleware = [thunk];
@@ -176,4 +177,35 @@ describe('Ducks - Bridge', () => {
       );
     });
   });
+
+  describe('resetBridgeState', () => {
+    it('dispatches action to the bridge controller', () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const mockStore = configureMockStore<any>(middleware)(
+        createBridgeMockStore({}, { fromTokenInputValue: '10' }),
+      );
+      const state = mockStore.getState().bridge;
+      const mockResetBridgeState = jest.fn();
+      setBackgroundConnection({
+        [BridgeBackgroundAction.RESET_STATE]: mockResetBridgeState,
+      } as never);
+
+      mockStore.dispatch(resetBridgeState() as never);
+
+      expect(mockResetBridgeState).toHaveBeenCalledTimes(1);
+      expect(mockResetBridgeState).toHaveBeenCalledWith(
+        undefined,
+        expect.anything(),
+      );
+      const actions = mockStore.getActions();
+      expect(actions[0].type).toStrictEqual('bridge/resetInputFields');
+      const newState = bridgeReducer(state, actions[0]);
+      expect(newState).toStrictEqual({
+        toChainId: null,
+        fromToken: null,
+        toToken: null,
+        fromTokenInputValue: null,
+      });
+    });
+  });
 });
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index dbb49a20d66b..e39f73f2fa15 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -6,8 +6,10 @@ import {
 } from '../../../shared/constants/network';
 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 {
   getAllBridgeableNetworks,
+  getBridgeQuotes,
   getFromAmount,
   getFromChain,
   getFromChains,
@@ -491,4 +493,81 @@ describe('Bridge selectors', () => {
       expect(result).toStrictEqual([{ address: '0x00', symbol: 'TEST' }]);
     });
   });
+
+  describe('getBridgeQuotes', () => {
+    it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=5', () => {
+      const state = createBridgeMockStore(
+        { extensionConfig: { maxRefreshCount: 5 } },
+        { toChainId: '0x1' },
+        {
+          quoteRequest: { insufficientBal: false },
+          quotes: mockErc20Erc20Quotes,
+          quotesFetchStatus: 1,
+          quotesRefreshCount: 5,
+          quotesLastFetched: 100,
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+        },
+      );
+      const result = getBridgeQuotes(state as never);
+
+      expect(result).toStrictEqual({
+        quotes: mockErc20Erc20Quotes,
+        quotesLastFetchedMs: 100,
+        isLoading: false,
+        quotesRefreshCount: 5,
+        isQuoteGoingToRefresh: false,
+      });
+    });
+
+    it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=2', () => {
+      const state = createBridgeMockStore(
+        { extensionConfig: { maxRefreshCount: 5 } },
+        { toChainId: '0x1' },
+        {
+          quoteRequest: { insufficientBal: false },
+          quotes: mockErc20Erc20Quotes,
+          quotesFetchStatus: 1,
+          quotesRefreshCount: 2,
+          quotesLastFetched: 100,
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+        },
+      );
+      const result = getBridgeQuotes(state as never);
+
+      expect(result).toStrictEqual({
+        quotes: mockErc20Erc20Quotes,
+        quotesLastFetchedMs: 100,
+        isLoading: false,
+        quotesRefreshCount: 2,
+        isQuoteGoingToRefresh: true,
+      });
+    });
+
+    it('returns quote list and fetch data, insufficientBal=true', () => {
+      const state = createBridgeMockStore(
+        { extensionConfig: { maxRefreshCount: 5 } },
+        { toChainId: '0x1' },
+        {
+          quoteRequest: { insufficientBal: true },
+          quotes: mockErc20Erc20Quotes,
+          quotesFetchStatus: 1,
+          quotesRefreshCount: 1,
+          quotesLastFetched: 100,
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+        },
+      );
+      const result = getBridgeQuotes(state as never);
+
+      expect(result).toStrictEqual({
+        quotes: mockErc20Erc20Quotes,
+        quotesLastFetchedMs: 100,
+        isLoading: false,
+        quotesRefreshCount: 1,
+        isQuoteGoingToRefresh: false,
+      });
+    });
+  });
 });
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index a05640ded5c2..60704aa6f094 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -130,28 +130,51 @@ export const getToToken = (
 export const getFromAmount = (state: BridgeAppState): string | null =>
   state.bridge.fromTokenInputValue;
 
-export const getBridgeQuotes = (state: BridgeAppState) => {
-  return {
-    quotes: state.metamask.bridgeState.quotes,
-    quotesLastFetchedMs: state.metamask.bridgeState.quotesLastFetched,
-    isLoading:
-      state.metamask.bridgeState.quotesLoadingStatus === RequestStatus.LOADING,
-  };
+export const getQuoteRequest = (state: BridgeAppState) => {
+  const { quoteRequest } = state.metamask.bridgeState;
+  return quoteRequest;
 };
 
+export const getBridgeQuotesConfig = (state: BridgeAppState) =>
+  state.metamask.bridgeState?.bridgeFeatureFlags[
+    BridgeFeatureFlagsKey.EXTENSION_CONFIG
+  ] ?? {};
+
+export const getBridgeQuotes = createSelector(
+  (state: BridgeAppState) => state.metamask.bridgeState.quotes,
+  (state: BridgeAppState) => state.metamask.bridgeState.quotesLastFetched,
+  (state: BridgeAppState) =>
+    state.metamask.bridgeState.quotesLoadingStatus === RequestStatus.LOADING,
+  (state: BridgeAppState) => state.metamask.bridgeState.quotesRefreshCount,
+  getBridgeQuotesConfig,
+  getQuoteRequest,
+  (
+    quotes,
+    quotesLastFetchedMs,
+    isLoading,
+    quotesRefreshCount,
+    { maxRefreshCount },
+    { insufficientBal },
+  ) => {
+    return {
+      quotes,
+      quotesLastFetchedMs,
+      isLoading,
+      quotesRefreshCount,
+      isQuoteGoingToRefresh: insufficientBal
+        ? false
+        : quotesRefreshCount < maxRefreshCount,
+    };
+  },
+);
+
 export const getRecommendedQuote = createSelector(
   getBridgeQuotes,
   ({ quotes }) => {
-    // TODO implement sorting
     return quotes[0];
   },
 );
 
-export const getQuoteRequest = (state: BridgeAppState) => {
-  const { quoteRequest } = state.metamask.bridgeState;
-  return quoteRequest;
-};
-
 export const getToAmount = createSelector(getRecommendedQuote, (quote) =>
   quote
     ? calcTokenAmount(
diff --git a/ui/hooks/bridge/useCountdownTimer.test.ts b/ui/hooks/bridge/useCountdownTimer.test.ts
index 14ac21d725fd..f2cd1190b1ba 100644
--- a/ui/hooks/bridge/useCountdownTimer.test.ts
+++ b/ui/hooks/bridge/useCountdownTimer.test.ts
@@ -16,12 +16,22 @@ describe('useCountdownTimer', () => {
   it('returns time remaining', async () => {
     const quotesLastFetched = Date.now();
     const { result } = renderUseCountdownTimer(
-      createBridgeMockStore({}, {}, { quotesLastFetched }),
+      createBridgeMockStore(
+        {},
+        {},
+        {
+          quotesLastFetched,
+          quotesRefreshCount: 0,
+          bridgeFeatureFlags: {
+            extensionConfig: { maxRefreshCount: 5, refreshRate: 40000 },
+          },
+        },
+      ),
     );
 
     let i = 0;
-    while (i <= 30) {
-      const secondsLeft = Math.min(30, 30 - i + 1);
+    while (i <= 40) {
+      const secondsLeft = Math.min(41, 40 - i + 2);
       expect(result.current).toStrictEqual(
         `0:${secondsLeft < 10 ? '0' : ''}${secondsLeft}`,
       );
diff --git a/ui/hooks/bridge/useCountdownTimer.ts b/ui/hooks/bridge/useCountdownTimer.ts
index 112d35b33f6a..39e7ac9d2eca 100644
--- a/ui/hooks/bridge/useCountdownTimer.ts
+++ b/ui/hooks/bridge/useCountdownTimer.ts
@@ -1,10 +1,10 @@
 import { Duration } from 'luxon';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { getBridgeQuotes } from '../../ducks/bridge/selectors';
-// TODO: Remove restricted import
-// eslint-disable-next-line import/no-restricted-paths
-import { REFRESH_INTERVAL_MS } from '../../../app/scripts/controllers/bridge/constants';
+import {
+  getBridgeQuotes,
+  getBridgeQuotesConfig,
+} from '../../ducks/bridge/selectors';
 import { SECOND } from '../../../shared/constants/time';
 
 /**
@@ -15,13 +15,15 @@ import { SECOND } from '../../../shared/constants/time';
  * @returns The formatted remaining time in 'm:ss' format.
  */
 export const useCountdownTimer = () => {
-  const [timeRemaining, setTimeRemaining] = useState(REFRESH_INTERVAL_MS);
   const { quotesLastFetchedMs } = useSelector(getBridgeQuotes);
+  const { refreshRate } = useSelector(getBridgeQuotesConfig);
+
+  const [timeRemaining, setTimeRemaining] = useState(refreshRate);
 
   useEffect(() => {
     if (quotesLastFetchedMs) {
       setTimeRemaining(
-        REFRESH_INTERVAL_MS - (Date.now() - quotesLastFetchedMs),
+        refreshRate - (Date.now() - quotesLastFetchedMs) + SECOND,
       );
     }
   }, [quotesLastFetchedMs]);
diff --git a/ui/hooks/bridge/useLatestBalance.test.ts b/ui/hooks/bridge/useLatestBalance.test.ts
index d1186c3eeb91..6d79672e4550 100644
--- a/ui/hooks/bridge/useLatestBalance.test.ts
+++ b/ui/hooks/bridge/useLatestBalance.test.ts
@@ -61,7 +61,7 @@ describe('useLatestBalance', () => {
 
     expect(mockGetBalance).toHaveBeenCalledTimes(1);
     expect(mockGetBalance).toHaveBeenCalledWith(
-      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+      '0x0DCD5D886577d5081B0c52e242Ef29E70Be3E7bc',
     );
     expect(mockFetchTokenBalance).toHaveBeenCalledTimes(0);
   });
diff --git a/ui/hooks/bridge/useLatestBalance.ts b/ui/hooks/bridge/useLatestBalance.ts
index dfe868a04090..524d65503249 100644
--- a/ui/hooks/bridge/useLatestBalance.ts
+++ b/ui/hooks/bridge/useLatestBalance.ts
@@ -1,17 +1,14 @@
 import { useSelector } from 'react-redux';
-import { zeroAddress } from 'ethereumjs-util';
-import { Web3Provider } from '@ethersproject/providers';
 import { Hex } from '@metamask/utils';
-import { BigNumber } from 'ethers';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { DEFAULT_PRECISION } from '../useCurrencyDisplay';
-import { fetchTokenBalance } from '../../../shared/lib/token-util';
 import {
   getCurrentChainId,
   getSelectedInternalAccount,
   SwapsEthToken,
 } from '../../selectors';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
+import { calcLatestSrcBalance } from '../../../shared/modules/bridge-utils/balance';
 import { useAsyncResult } from '../useAsyncResult';
 
 /**
@@ -28,21 +25,25 @@ const useLatestBalance = (
   const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
   const currentChainId = useSelector(getCurrentChainId);
 
-  const { value: latestBalance } = useAsyncResult<BigNumber>(async () => {
-    if (token && chainId && currentChainId === chainId) {
-      if (!token.address || token.address === zeroAddress()) {
-        const ethersProvider = new Web3Provider(global.ethereumProvider);
-        return await ethersProvider.getBalance(selectedAddress);
-      }
-      return await fetchTokenBalance(
-        token.address,
-        selectedAddress,
+  const { value: latestBalance } = useAsyncResult<
+    Numeric | undefined
+  >(async () => {
+    if (token?.address && chainId && currentChainId === chainId) {
+      return await calcLatestSrcBalance(
         global.ethereumProvider,
+        selectedAddress,
+        token.address,
+        chainId,
       );
     }
-
     return undefined;
-  }, [token, selectedAddress, global.ethereumProvider]);
+  }, [
+    chainId,
+    currentChainId,
+    token,
+    selectedAddress,
+    global.ethereumProvider,
+  ]);
 
   if (token && !token.decimals) {
     throw new Error(
@@ -55,7 +56,7 @@ const useLatestBalance = (
   return {
     formattedBalance:
       token && latestBalance
-        ? Numeric.from(latestBalance.toString(), 10)
+        ? latestBalance
             .shiftedBy(tokenDecimals)
             .round(DEFAULT_PRECISION)
             .toString()
diff --git a/ui/pages/bridge/bridge.util.test.ts b/ui/pages/bridge/bridge.util.test.ts
index d8cba6c109b0..30514dbf7f96 100644
--- a/ui/pages/bridge/bridge.util.test.ts
+++ b/ui/pages/bridge/bridge.util.test.ts
@@ -172,22 +172,27 @@ describe('Bridge utils', () => {
       (fetchWithCache as jest.Mock).mockResolvedValue(
         mockBridgeQuotesNativeErc20,
       );
+      const { signal } = new AbortController();
 
-      const result = await fetchBridgeQuotes({
-        walletAddress: '0x123',
-        srcChainId: 1,
-        destChainId: 10,
-        srcTokenAddress: zeroAddress(),
-        destTokenAddress: zeroAddress(),
-        srcTokenAmount: '20000',
-        slippage: 0.5,
-      });
+      const result = await fetchBridgeQuotes(
+        {
+          walletAddress: '0x123',
+          srcChainId: 1,
+          destChainId: 10,
+          srcTokenAddress: zeroAddress(),
+          destTokenAddress: zeroAddress(),
+          srcTokenAmount: '20000',
+          slippage: 0.5,
+        },
+        signal,
+      );
 
       expect(fetchWithCache).toHaveBeenCalledWith({
         url: 'https://bridge.api.cx.metamask.io/getQuote?walletAddress=0x123&srcChainId=1&destChainId=10&srcTokenAddress=0x0000000000000000000000000000000000000000&destTokenAddress=0x0000000000000000000000000000000000000000&srcTokenAmount=20000&slippage=0.5&insufficientBal=false&resetApproval=false',
         fetchOptions: {
           method: 'GET',
           headers: { 'X-Client-Id': 'extension' },
+          signal,
         },
         cacheOptions: { cacheRefreshTime: 0 },
         functionName: 'fetchBridgeQuotes',
@@ -202,22 +207,27 @@ describe('Bridge utils', () => {
         { ...mockBridgeQuotesErc20Erc20[0], approval: null },
         { ...mockBridgeQuotesErc20Erc20[0], trade: null },
       ]);
+      const { signal } = new AbortController();
 
-      const result = await fetchBridgeQuotes({
-        walletAddress: '0x123',
-        srcChainId: 1,
-        destChainId: 10,
-        srcTokenAddress: zeroAddress(),
-        destTokenAddress: zeroAddress(),
-        srcTokenAmount: '20000',
-        slippage: 0.5,
-      });
+      const result = await fetchBridgeQuotes(
+        {
+          walletAddress: '0x123',
+          srcChainId: 1,
+          destChainId: 10,
+          srcTokenAddress: zeroAddress(),
+          destTokenAddress: zeroAddress(),
+          srcTokenAmount: '20000',
+          slippage: 0.5,
+        },
+        signal,
+      );
 
       expect(fetchWithCache).toHaveBeenCalledWith({
         url: 'https://bridge.api.cx.metamask.io/getQuote?walletAddress=0x123&srcChainId=1&destChainId=10&srcTokenAddress=0x0000000000000000000000000000000000000000&destTokenAddress=0x0000000000000000000000000000000000000000&srcTokenAmount=20000&slippage=0.5&insufficientBal=false&resetApproval=false',
         fetchOptions: {
           method: 'GET',
           headers: { 'X-Client-Id': 'extension' },
+          signal,
         },
         cacheOptions: { cacheRefreshTime: 0 },
         functionName: 'fetchBridgeQuotes',
@@ -251,22 +261,27 @@ describe('Bridge utils', () => {
           },
         },
       ]);
+      const { signal } = new AbortController();
 
-      const result = await fetchBridgeQuotes({
-        walletAddress: '0x123',
-        srcChainId: 1,
-        destChainId: 10,
-        srcTokenAddress: zeroAddress(),
-        destTokenAddress: zeroAddress(),
-        srcTokenAmount: '20000',
-        slippage: 0.5,
-      });
+      const result = await fetchBridgeQuotes(
+        {
+          walletAddress: '0x123',
+          srcChainId: 1,
+          destChainId: 10,
+          srcTokenAddress: zeroAddress(),
+          destTokenAddress: zeroAddress(),
+          srcTokenAmount: '20000',
+          slippage: 0.5,
+        },
+        signal,
+      );
 
       expect(fetchWithCache).toHaveBeenCalledWith({
         url: 'https://bridge.api.cx.metamask.io/getQuote?walletAddress=0x123&srcChainId=1&destChainId=10&srcTokenAddress=0x0000000000000000000000000000000000000000&destTokenAddress=0x0000000000000000000000000000000000000000&srcTokenAmount=20000&slippage=0.5&insufficientBal=false&resetApproval=false',
         fetchOptions: {
           method: 'GET',
           headers: { 'X-Client-Id': 'extension' },
+          signal,
         },
         cacheOptions: { cacheRefreshTime: 0 },
         functionName: 'fetchBridgeQuotes',
diff --git a/ui/pages/bridge/bridge.util.ts b/ui/pages/bridge/bridge.util.ts
index f154b7e62b19..bbdddab53658 100644
--- a/ui/pages/bridge/bridge.util.ts
+++ b/ui/pages/bridge/bridge.util.ts
@@ -136,6 +136,7 @@ export async function fetchBridgeTokens(
 // Returns a list of bridge tx quotes
 export async function fetchBridgeQuotes(
   request: QuoteRequest,
+  signal: AbortSignal,
 ): Promise<QuoteResponse[]> {
   const queryParams = new URLSearchParams({
     walletAddress: request.walletAddress,
@@ -151,7 +152,11 @@ export async function fetchBridgeQuotes(
   const url = `${BRIDGE_API_BASE_URL}/getQuote?${queryParams}`;
   const quotes = await fetchWithCache({
     url,
-    fetchOptions: { method: 'GET', headers: CLIENT_ID_HEADER },
+    fetchOptions: {
+      method: 'GET',
+      headers: CLIENT_ID_HEADER,
+      signal,
+    },
     cacheOptions: { cacheRefreshTime: 0 },
     functionName: 'fetchBridgeQuotes',
   });
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index 0d0d4c21c71f..7d5f813513c5 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -8,6 +8,7 @@ import { renderWithProvider, MOCKS, CONSTANTS } from '../../../test/jest';
 import { createBridgeMockStore } from '../../../test/jest/mock-store';
 import CrossChainSwap from '.';
 
+const mockResetBridgeState = jest.fn();
 const middleware = [thunk];
 setBackgroundConnection({
   resetPostFetchState: jest.fn(),
@@ -24,6 +25,7 @@ setBackgroundConnection({
     .mockResolvedValue({ chainId: '0x1' }),
   setBridgeFeatureFlags: jest.fn(),
   selectSrcNetwork: jest.fn(),
+  resetState: () => mockResetBridgeState(),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any);
 
@@ -73,5 +75,6 @@ describe('Bridge', () => {
 
     expect(getByText('Bridge')).toBeInTheDocument();
     expect(container).toMatchSnapshot();
+    expect(mockResetBridgeState).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index e81b20670011..62244e5793e5 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -24,7 +24,7 @@ import {
   Header,
 } from '../../components/multichain/pages/page';
 import { getProviderConfig } from '../../ducks/metamask/metamask';
-import { resetInputFields, setFromChain } from '../../ducks/bridge/actions';
+import { resetBridgeState, setFromChain } from '../../ducks/bridge/actions';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
 import { BridgeCTAButton } from './prepare/bridge-cta-button';
 
@@ -45,11 +45,23 @@ const CrossChainSwap = () => {
       isBridgeEnabled &&
       providerConfig &&
       dispatch(setFromChain(providerConfig.chainId));
+  }, [isBridgeChain, isBridgeEnabled, providerConfig]);
+
+  const resetControllerAndInputStates = async () => {
+    await dispatch(resetBridgeState());
+  };
+
+  useEffect(() => {
+    // Reset controller and inputs before unloading the page
+    resetControllerAndInputStates();
+
+    window.addEventListener('beforeunload', resetControllerAndInputStates);
 
     return () => {
-      dispatch(resetInputFields());
+      window.removeEventListener('beforeunload', resetControllerAndInputStates);
+      resetControllerAndInputStates();
     };
-  }, [isBridgeChain, isBridgeEnabled, providerConfig]);
+  }, []);
 
   const redirectToDefaultRoute = async () => {
     history.push({
@@ -58,6 +70,7 @@ const CrossChainSwap = () => {
     });
     dispatch(clearSwapsState());
     await dispatch(resetBackgroundSwapsState());
+    await resetControllerAndInputStates();
   };
 
   return (
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 1ae0b59f3757..aba35d5b89be 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -18,6 +18,10 @@ describe('PrepareBridgePage', () => {
     global.ethereumProvider = provider as any;
   });
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('should render the component, with initial state', async () => {
     const mockStore = createBridgeMockStore(
       {
@@ -54,9 +58,17 @@ describe('PrepareBridgePage', () => {
       {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        destTokens: {
+          '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
+            iconUrl: 'http://url',
+            symbol: 'UNI',
+            address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+            decimals: 6,
+          },
+        },
       },
       {
-        fromTokenInputValue: 1,
+        fromTokenInputValue: '1',
         fromToken: { address: '0x3103910', decimals: 6 },
         toToken: {
           iconUrl: 'http://url',
@@ -90,6 +102,7 @@ describe('PrepareBridgePage', () => {
     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: '2' } });
     });
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index f71dc0813d33..46fbdd77786b 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -41,6 +41,7 @@ import { QuoteRequest } from '../types';
 import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
 import { BridgeQuoteCard } from '../quotes/bridge-quote-card';
 import { isValidQuoteRequest } from '../utils/quote';
+import { getProviderConfig } from '../../../ducks/metamask/metamask';
 import { BridgeInputGroup } from './bridge-input-group';
 
 const PrepareBridgePage = () => {
@@ -64,6 +65,8 @@ const PrepareBridgePage = () => {
   const fromAmount = useSelector(getFromAmount);
   const toAmount = useSelector(getToAmount);
 
+  const providerConfig = useSelector(getProviderConfig);
+
   const quoteRequest = useSelector(getQuoteRequest);
 
   const fromTokenListGenerator = useTokensWithFiltering(
@@ -95,8 +98,19 @@ const PrepareBridgePage = () => {
       destChainId: toChain?.chainId
         ? Number(hexToDecimal(toChain.chainId))
         : undefined,
+      // This override allows quotes to be returned when the rpcUrl is a tenderly fork
+      // 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')),
     }),
-    [fromToken, toToken, fromChain?.chainId, toChain?.chainId, fromAmount],
+    [
+      fromToken,
+      toToken,
+      fromChain?.chainId,
+      toChain?.chainId,
+      fromAmount,
+      providerConfig,
+    ],
   );
 
   const debouncedUpdateQuoteRequestInController = useCallback(
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
index b9bfc69e8e5a..274ade65a4d1 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
@@ -23,9 +23,14 @@ describe('BridgeQuoteCard', () => {
       },
       { fromTokenInputValue: 1 },
       {
+        quoteRequest: { insufficientBal: false },
+        quotesRefreshCount: 1,
         quotes: mockBridgeQuotesErc20Erc20,
         getQuotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.FETCHED,
+        bridgeFeatureFlags: {
+          extensionConfig: { maxRefreshCount: 5, refreshRate: 30000 },
+        },
       },
     );
     const { container } = renderWithProvider(
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.tsx b/ui/pages/bridge/quotes/bridge-quote-card.tsx
index 2928565809af..fc1176c8c3f9 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.tsx
@@ -20,7 +20,7 @@ import { BridgeQuotesModal } from './bridge-quotes-modal';
 export const BridgeQuoteCard = () => {
   const t = useI18nContext();
   const recommendedQuote = useSelector(getRecommendedQuote);
-  const { isLoading } = useSelector(getBridgeQuotes);
+  const { isLoading, isQuoteGoingToRefresh } = useSelector(getBridgeQuotes);
 
   const { etaInMinutes, totalFees, quoteRate } =
     getQuoteDisplayData(recommendedQuote);
@@ -44,7 +44,7 @@ export const BridgeQuoteCard = () => {
         onClose={() => setShowAllQuotes(false)}
       />
       <Box className="bridge-box quote-card__timer">
-        {!isLoading && (
+        {!isLoading && isQuoteGoingToRefresh && (
           <Text>{t('swapNewQuoteIn', [secondsUntilNextRefresh])}</Text>
         )}
       </Box>

From 7b3f951f825d06c081b79411925610d4b6eb4940 Mon Sep 17 00:00:00 2001
From: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
Date: Wed, 13 Nov 2024 00:33:25 +0100
Subject: [PATCH 080/111] chore(deps): bump
 `@metamask/eth-ledger-bridge-keyring` to `^5.0.1` (#27688)
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 the `@metamask/eth-ledger-bridge-keyring` dependency to
`^5.0.1`.

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

## **Related issues**

Unblocks: https://github.com/MetaMask/metamask-extension/issues/26840

## **Manual testing steps**

This changes directly impacts Ledger devices:
1. Add one or more ledger accounts
2. Sign message
3. Sign typed data
4. Sign transaction
5. Remove Ledger accounts

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

**Add account and sign**


https://github.com/user-attachments/assets/d685a416-6931-4aae-b207-e263ac235064

**Forget device**


https://github.com/user-attachments/assets/0e11216a-04e1-4166-af4e-e7847d1b2809

## **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.
---
 ...gerhq-evm-tools-npm-1.2.3-414f44baa9.patch |  15 ++
 ...rhq-hw-app-eth-npm-6.39.0-866309bbbe.patch |  65 +++++
 lavamoat/browserify/beta/policy.json          | 182 +++++++++++++-
 lavamoat/browserify/flask/policy.json         | 182 +++++++++++++-
 lavamoat/browserify/main/policy.json          | 182 +++++++++++++-
 lavamoat/browserify/mmi/policy.json           | 182 +++++++++++++-
 package.json                                  |  10 +-
 yarn.lock                                     | 234 ++++++++++++++++--
 8 files changed, 980 insertions(+), 72 deletions(-)
 create mode 100644 .yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch
 create mode 100644 .yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch

diff --git a/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch b/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch
new file mode 100644
index 000000000000..15335a88e494
--- /dev/null
+++ b/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/message/EIP712/index.js b/lib/message/EIP712/index.js
+index 5443ac06d4ef29028e3acce98210949da2ef9263..57ec8615340a9285290ad5d2c2522ed19af2d0fc 100644
+--- a/lib/message/EIP712/index.js
++++ b/lib/message/EIP712/index.js
+@@ -28,8 +28,8 @@ const ethers_1 = require("ethers");
+ const axios_1 = __importDefault(require("axios"));
+ const sha224_1 = __importDefault(require("crypto-js/sha224"));
+ const live_env_1 = require("@ledgerhq/live-env");
+-const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712"));
+-const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2"));
++const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/lib/data/eip712"));
++const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/lib/data/eip712_v2"));
+ // As defined in [spec](https://eips.ethereum.org/EIPS/eip-712), the properties below are all required.
+ function isEIP712Message(message) {
+     return (!!message &&
diff --git a/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch b/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch
new file mode 100644
index 000000000000..cfefcca767a7
--- /dev/null
+++ b/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch
@@ -0,0 +1,65 @@
+diff --git a/lib/modules/EIP712/index.js b/lib/modules/EIP712/index.js
+index bbca23c9a596b2b300aca0f323bad277a4190def..c85cb18c3d6ff049c442d358b4d834c04a49951f 100644
+--- a/lib/modules/EIP712/index.js
++++ b/lib/modules/EIP712/index.js
+@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.signEIP712HashedMessage = exports.signEIP712Message = void 0;
+ /* eslint-disable @typescript-eslint/no-duplicate-enum-values */
+ const semver_1 = __importDefault(require("semver"));
+-const index_1 = require("@ledgerhq/evm-tools/message/EIP712/index");
++const index_1 = require("@ledgerhq/evm-tools/lib/message/EIP712/index");
+ const erc20_1 = require("../../services/ledger/erc20");
+ const utils_1 = require("../../utils");
+ const loadConfig_1 = require("../../services/ledger/loadConfig");
+diff --git a/lib/modules/EIP712/utils.js b/lib/modules/EIP712/utils.js
+index 4f09ea8a24ae4f175f1a4d2d40999d36ffa2a915..1cc7de0d5ffd2b980741ad6d85a75792085c031b 100644
+--- a/lib/modules/EIP712/utils.js
++++ b/lib/modules/EIP712/utils.js
+@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.getPayloadForFilterV2 = exports.getFilterDisplayNameAndSigBuffers = exports.getAppAndVersion = exports.getCoinRefTokensMap = exports.makeTypeEntryStructBuffer = exports.constructTypeDescByteString = exports.destructTypeFromString = exports.EIP712_TYPE_ENCODERS = exports.EIP712_TYPE_PROPERTIES = void 0;
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
+-const index_1 = require("@ledgerhq/evm-tools/message/index");
++const index_1 = require("@ledgerhq/evm-tools/lib/message/index");
+ const utils_1 = require("../../utils");
+ /**
+  * @ignore for the README
+diff --git a/lib/services/ledger/erc20.js b/lib/services/ledger/erc20.js
+index 8fdedf8037b2684ab6d48fd279a0c014b074b676..c10cea22504a4d3cd72bfac51463e5664639d20e 100644
+--- a/lib/services/ledger/erc20.js
++++ b/lib/services/ledger/erc20.js
+@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.byContractAddressAndChainId = exports.findERC20SignaturesInfo = void 0;
+ const axios_1 = __importDefault(require("axios"));
+ const logs_1 = require("@ledgerhq/logs");
+-const index_1 = require("@ledgerhq/cryptoassets-evm-signatures/data/evm/index");
++const index_1 = require("@ledgerhq/cryptoassets-evm-signatures/lib/data/evm/index");
+ const loadConfig_1 = require("./loadConfig");
+ const asContractAddress = (addr) => {
+     const a = addr.toLowerCase();
+diff --git a/lib/services/ledger/index.js b/lib/services/ledger/index.js
+index 8385537236dfc98902376b29f712e9f7b605091a..6641b951b0c7e477fe5622c724ee22b9e5272213 100644
+--- a/lib/services/ledger/index.js
++++ b/lib/services/ledger/index.js
+@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
+ // This implements the resolution of a Transaction using Ledger's own API
+ const logs_1 = require("@ledgerhq/logs");
+ const abi_1 = require("@ethersproject/abi");
+-const index_1 = require("@ledgerhq/domain-service/signers/index");
++const index_1 = require("@ledgerhq/domain-service/lib/signers/index");
+ const erc20_1 = require("./erc20");
+ const contracts_1 = require("./contracts");
+ const nfts_1 = require("./nfts");
+diff --git a/lib/utils.js b/lib/utils.js
+index 027089bf09c047b34af79e3dea253d5335d336f3..1c5da628db47a33099532973de9ea634a1ee65df 100644
+--- a/lib/utils.js
++++ b/lib/utils.js
+@@ -2,7 +2,7 @@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.mergeResolutions = exports.nftSelectors = exports.tokenSelectors = exports.intAsHexBytes = exports.decodeTxInfo = exports.maybeHexBuffer = exports.hexBuffer = exports.splitPath = exports.padHexString = exports.ERC1155_CLEAR_SIGNED_SELECTORS = exports.ERC721_CLEAR_SIGNED_SELECTORS = exports.ERC20_CLEAR_SIGNED_SELECTORS = void 0;
+ const bignumber_js_1 = require("bignumber.js");
+-const index_1 = require("@ledgerhq/evm-tools/selectors/index");
++const index_1 = require("@ledgerhq/evm-tools/lib/selectors/index");
+ Object.defineProperty(exports, "ERC20_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC20_CLEAR_SIGNED_SELECTORS; } });
+ Object.defineProperty(exports, "ERC721_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC721_CLEAR_SIGNED_SELECTORS; } });
+ Object.defineProperty(exports, "ERC1155_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC1155_CLEAR_SIGNED_SELECTORS; } });
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index eaac48a8f5f0..94bf575e610a 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -895,7 +895,7 @@
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
-        "console.log": true,
+        "console.error": true,
         "document.createElement": true,
         "document.head.appendChild": true,
         "fetch": true,
@@ -905,6 +905,7 @@
         "@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,
@@ -916,6 +917,152 @@
         "TextEncoder": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+      "globals": {
+        "console.warn": 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/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": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+      "globals": {
+        "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
+        "@metamask/ppom-validator>crypto-js": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "wait-on>rxjs": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
+      "globals": {
+        "__ledgerLogsListen": "write",
+        "console.error": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
     "@metamask/eth-query": {
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
@@ -2521,9 +2668,9 @@
     "@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/util": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
@@ -2539,7 +2686,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -3650,6 +3797,11 @@
         "process": true
       }
     },
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
+      }
+    },
     "base32-encode": {
       "packages": {
         "base32-encode>to-data-view": true
@@ -4165,6 +4317,7 @@
       "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,
@@ -4172,7 +4325,6 @@
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": 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,
@@ -4190,15 +4342,10 @@
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
       }
@@ -4216,7 +4363,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -5690,6 +5837,17 @@
         "msCrypto": true
       }
     },
+    "wait-on>rxjs": {
+      "globals": {
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
+      }
+    },
     "web3": {
       "globals": {
         "XMLHttpRequest": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index eaac48a8f5f0..94bf575e610a 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -895,7 +895,7 @@
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
-        "console.log": true,
+        "console.error": true,
         "document.createElement": true,
         "document.head.appendChild": true,
         "fetch": true,
@@ -905,6 +905,7 @@
         "@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,
@@ -916,6 +917,152 @@
         "TextEncoder": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+      "globals": {
+        "console.warn": 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/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": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+      "globals": {
+        "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
+        "@metamask/ppom-validator>crypto-js": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "wait-on>rxjs": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
+      "globals": {
+        "__ledgerLogsListen": "write",
+        "console.error": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
     "@metamask/eth-query": {
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
@@ -2521,9 +2668,9 @@
     "@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/util": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
@@ -2539,7 +2686,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -3650,6 +3797,11 @@
         "process": true
       }
     },
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
+      }
+    },
     "base32-encode": {
       "packages": {
         "base32-encode>to-data-view": true
@@ -4165,6 +4317,7 @@
       "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,
@@ -4172,7 +4325,6 @@
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": 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,
@@ -4190,15 +4342,10 @@
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
       }
@@ -4216,7 +4363,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -5690,6 +5837,17 @@
         "msCrypto": true
       }
     },
+    "wait-on>rxjs": {
+      "globals": {
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
+      }
+    },
     "web3": {
       "globals": {
         "XMLHttpRequest": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index eaac48a8f5f0..94bf575e610a 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -895,7 +895,7 @@
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
-        "console.log": true,
+        "console.error": true,
         "document.createElement": true,
         "document.head.appendChild": true,
         "fetch": true,
@@ -905,6 +905,7 @@
         "@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,
@@ -916,6 +917,152 @@
         "TextEncoder": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+      "globals": {
+        "console.warn": 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/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": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+      "globals": {
+        "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
+        "@metamask/ppom-validator>crypto-js": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "wait-on>rxjs": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
+      "globals": {
+        "__ledgerLogsListen": "write",
+        "console.error": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
     "@metamask/eth-query": {
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
@@ -2521,9 +2668,9 @@
     "@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/util": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
@@ -2539,7 +2686,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -3650,6 +3797,11 @@
         "process": true
       }
     },
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
+      }
+    },
     "base32-encode": {
       "packages": {
         "base32-encode>to-data-view": true
@@ -4165,6 +4317,7 @@
       "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,
@@ -4172,7 +4325,6 @@
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": 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,
@@ -4190,15 +4342,10 @@
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
       }
@@ -4216,7 +4363,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -5690,6 +5837,17 @@
         "msCrypto": true
       }
     },
+    "wait-on>rxjs": {
+      "globals": {
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
+      }
+    },
     "web3": {
       "globals": {
         "XMLHttpRequest": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 467ef781215c..9acbc67302ab 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -987,7 +987,7 @@
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
-        "console.log": true,
+        "console.error": true,
         "document.createElement": true,
         "document.head.appendChild": true,
         "fetch": true,
@@ -997,6 +997,7 @@
         "@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,
@@ -1008,6 +1009,152 @@
         "TextEncoder": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+      "globals": {
+        "console.warn": 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/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": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+      "globals": {
+        "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
+        "@metamask/ppom-validator>crypto-js": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "wait-on>rxjs": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "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/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
+      "globals": {
+        "__ledgerLogsListen": "write",
+        "console.error": 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
+      },
+      "packages": {
+        "axios>form-data": true,
+        "browserify>buffer": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
     "@metamask/eth-query": {
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
@@ -2613,9 +2760,9 @@
     "@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/util": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
@@ -2631,7 +2778,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -3742,6 +3889,11 @@
         "process": true
       }
     },
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
+      }
+    },
     "base32-encode": {
       "packages": {
         "base32-encode>to-data-view": true
@@ -4257,6 +4409,7 @@
       "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,
@@ -4264,7 +4417,6 @@
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": 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,
@@ -4282,15 +4434,10 @@
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
       }
@@ -4308,7 +4455,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -5758,6 +5905,17 @@
         "msCrypto": true
       }
     },
+    "wait-on>rxjs": {
+      "globals": {
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
+      }
+    },
     "web3": {
       "globals": {
         "XMLHttpRequest": true
diff --git a/package.json b/package.json
index 39a5bb13b596..6c9811cb3ed6 100644
--- a/package.json
+++ b/package.json
@@ -250,7 +250,13 @@
     "@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",
-    "path-to-regexp": "1.9.0"
+    "path-to-regexp": "1.9.0",
+    "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0",
+    "@ledgerhq/domain-service/axios": "^0.28.0",
+    "@ledgerhq/evm-tools/axios": "^0.28.0",
+    "@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"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
@@ -297,7 +303,7 @@
     "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch",
-    "@metamask/eth-ledger-bridge-keyring": "^3.0.1",
+    "@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": "^4.4.0",
diff --git a/yarn.lock b/yarn.lock
index 95217329e1c3..d40270b12e9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2323,7 +2323,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/rlp@npm:^4.0.0, @ethereumjs/rlp@npm:^4.0.1":
+"@ethereumjs/rlp@npm:^4.0.1":
   version: 4.0.1
   resolution: "@ethereumjs/rlp@npm:4.0.1"
   bin:
@@ -2398,7 +2398,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.6.4, @ethersproject/abi@npm:^5.7.0":
+"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.6.4, @ethersproject/abi@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/abi@npm:5.7.0"
   dependencies:
@@ -2700,7 +2700,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0":
+"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.5.0, @ethersproject/rlp@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/rlp@npm:5.7.0"
   dependencies:
@@ -4265,6 +4265,168 @@ __metadata:
   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"
+  dependencies:
+    "@ledgerhq/live-env": "npm:^2.3.0"
+    axios: "npm:1.7.7"
+  checksum: 10/ce6e3343fdf60255ede1d784a2fb47c8c5f49e8257559947e2678fac250700140695c85ae06bef777ccc4bb37577db813a4b3d031f3b0b84cbcd6e139613fbf9
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/devices@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@ledgerhq/devices@npm:8.4.4"
+  dependencies:
+    "@ledgerhq/errors": "npm:^6.19.1"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    rxjs: "npm:^7.8.1"
+    semver: "npm:^7.3.5"
+  checksum: 10/57136fc45ae2fa42b3cf93eb7cc3542fd84010390b3d0a536d342c7e92f90e475d608b1774f17a547419edddd7df0d0b1b1dbd6d2c778009ebab0fc3ec313f67
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/domain-service@npm:^1.2.6":
+  version: 1.2.6
+  resolution: "@ledgerhq/domain-service@npm:1.2.6"
+  dependencies:
+    "@ledgerhq/errors": "npm:^6.19.1"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    "@ledgerhq/types-live": "npm:^6.52.0"
+    axios: "npm:1.7.7"
+    eip55: "npm:^2.1.1"
+    react: "npm:^18.2.0"
+    react-dom: "npm:^18.2.0"
+  checksum: 10/0b680af9deff24f608446cb7026b06e09ea693a367a5ef5e71068c70fabfbb98019cb618daefed278ed875a0ff5d296735fb743746ac0edee1357ae12fd58d99
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/errors@npm:^6.19.1":
+  version: 6.19.1
+  resolution: "@ledgerhq/errors@npm:6.19.1"
+  checksum: 10/8265c6d73c314a4aabbe060ec29e2feebb4e904fe811bf7a9c53cde08e713dcbceded9d927ebb2f0ffc47a7b16524379d4a7e9aa3d61945b8a832be7cd5cf69b
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/evm-tools@npm:1.2.3":
+  version: 1.2.3
+  resolution: "@ledgerhq/evm-tools@npm:1.2.3"
+  dependencies:
+    "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0"
+    "@ledgerhq/live-env": "npm:^2.3.0"
+    axios: "npm:1.7.7"
+    crypto-js: "npm:4.2.0"
+    ethers: "npm:5.7.2"
+  checksum: 10/956a0a3ac26454ac350c5e34b5cfb911ed3a0f3f724bec1ce2c56f2de344635b582f977e4901841c353d98c50b076e40bfb03d865eed3a82e328744043e00ee7
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch":
+  version: 1.2.3
+  resolution: "@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch::version=1.2.3&hash=1deaa9"
+  dependencies:
+    "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0"
+    "@ledgerhq/live-env": "npm:^2.3.0"
+    axios: "npm:1.7.7"
+    crypto-js: "npm:4.2.0"
+    ethers: "npm:5.7.2"
+  checksum: 10/c7d79c691f681376efc6c44d16a00f6349301091a82a7a8ad264475562896bf8a9b4e922080f4f6f541bb62483ad9efeeec87910fa6f15d9db3e1d22820548c8
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/hw-app-eth@npm:6.39.0":
+  version: 6.39.0
+  resolution: "@ledgerhq/hw-app-eth@npm:6.39.0"
+  dependencies:
+    "@ethersproject/abi": "npm:^5.5.0"
+    "@ethersproject/rlp": "npm:^5.5.0"
+    "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0"
+    "@ledgerhq/domain-service": "npm:^1.2.6"
+    "@ledgerhq/errors": "npm:^6.19.1"
+    "@ledgerhq/evm-tools": "npm:^1.2.3"
+    "@ledgerhq/hw-transport": "npm:^6.31.4"
+    "@ledgerhq/hw-transport-mocker": "npm:^6.29.4"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    "@ledgerhq/types-live": "npm:^6.52.0"
+    axios: "npm:1.7.7"
+    bignumber.js: "npm:^9.1.2"
+    semver: "npm:^7.3.5"
+  checksum: 10/5b50aac35989e09704557523efe5b6b29a1f31f5279088ecceb90164e32e05860f3ff20c32a084003a69723ed08165ae140c2987424657245f088c3f9a908cd6
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch":
+  version: 6.39.0
+  resolution: "@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch::version=6.39.0&hash=f5404c"
+  dependencies:
+    "@ethersproject/abi": "npm:^5.5.0"
+    "@ethersproject/rlp": "npm:^5.5.0"
+    "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0"
+    "@ledgerhq/domain-service": "npm:^1.2.6"
+    "@ledgerhq/errors": "npm:^6.19.1"
+    "@ledgerhq/evm-tools": "npm:^1.2.3"
+    "@ledgerhq/hw-transport": "npm:^6.31.4"
+    "@ledgerhq/hw-transport-mocker": "npm:^6.29.4"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    "@ledgerhq/types-live": "npm:^6.52.0"
+    axios: "npm:1.7.7"
+    bignumber.js: "npm:^9.1.2"
+    semver: "npm:^7.3.5"
+  checksum: 10/fb270eee2b2d0886462908b4c511262da0c884f0b72ab50225407608d197ece71b05b4fdc07e628c75ab3ae573e49ed5c3ccf3b2f40a28e4663a28788d46b4dd
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/hw-transport-mocker@npm:^6.29.4":
+  version: 6.29.4
+  resolution: "@ledgerhq/hw-transport-mocker@npm:6.29.4"
+  dependencies:
+    "@ledgerhq/hw-transport": "npm:^6.31.4"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    rxjs: "npm:^7.8.1"
+  checksum: 10/6f1568b1723ee6964872b09b712714bacf33c87e83413a33420b7ba11e3c30fa6786f02d2cf7b8bc9b3560f4b5c3b166017d5e0a960267a7824a153687fe32ed
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/hw-transport@npm:^6.31.4":
+  version: 6.31.4
+  resolution: "@ledgerhq/hw-transport@npm:6.31.4"
+  dependencies:
+    "@ledgerhq/devices": "npm:^8.4.4"
+    "@ledgerhq/errors": "npm:^6.19.1"
+    "@ledgerhq/logs": "npm:^6.12.0"
+    events: "npm:^3.3.0"
+  checksum: 10/cf101e5b818e95e59031241d556dbec24658f54104910e414be493bc4b90b0aea50f5d4b3339a237dd0b12845bb2683c845f3a82f2ea9da4e077b68d1e1f7e48
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/live-env@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "@ledgerhq/live-env@npm:2.3.0"
+  dependencies:
+    rxjs: "npm:^7.8.1"
+    utility-types: "npm:^3.10.0"
+  checksum: 10/757ff834d6b94dce0487d60ab0efa45ef206ebbdfd29053c232b4c0fdce1594016531340c1603695b37f17deb1639dcb98078a9629eeb36c835a19f4180834ce
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/logs@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "@ledgerhq/logs@npm:6.12.0"
+  checksum: 10/a0a01f5d6edb0c14e7a42d24ab67ce362219517f6a50d0572c917f4f7988a1e2e9363e3d0fb170fe267f054e1e30a111564de44276e01c538b258d902c546421
+  languageName: node
+  linkType: hard
+
+"@ledgerhq/types-live@npm:^6.52.0":
+  version: 6.52.0
+  resolution: "@ledgerhq/types-live@npm:6.52.0"
+  dependencies:
+    bignumber.js: "npm:^9.1.2"
+    rxjs: "npm:^7.8.1"
+  checksum: 10/c410f02159538d66f59956512fc5bab2cb17edee7f6a15a517c31d89d6c730e52691666bb2e1d98718c701e94306dd7498544ea3d7772ff0b5ad6522fb2c335c
+  languageName: node
+  linkType: hard
+
 "@leichtgewicht/ip-codec@npm:^2.0.1":
   version: 2.0.4
   resolution: "@leichtgewicht/ip-codec@npm:2.0.4"
@@ -5212,16 +5374,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-ledger-bridge-keyring@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@metamask/eth-ledger-bridge-keyring@npm:3.0.1"
+"@metamask/eth-ledger-bridge-keyring@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@metamask/eth-ledger-bridge-keyring@npm:5.0.1"
   dependencies:
-    "@ethereumjs/rlp": "npm:^4.0.0"
-    "@ethereumjs/tx": "npm:^4.1.1"
-    "@ethereumjs/util": "npm:^8.0.0"
-    "@metamask/eth-sig-util": "npm:^7.0.0"
+    "@ethereumjs/rlp": "npm:^5.0.2"
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@ledgerhq/hw-app-eth": "npm:^6.39.0"
+    "@metamask/eth-sig-util": "npm:^7.0.3"
     hdkey: "npm:^2.1.0"
-  checksum: 10/6643cca79fd6c1d2d65ff8affed1f8a776d1455025695396970605350b2cbfd14750c5fb1913d43552a61f9a369e0904a1accd46a9b8d771f7cd0196af6c1ae4
+  checksum: 10/5ac967d7c88c2f1f2853118cfe65ee081a90c2633fb468eae8049c3a78a4985f03130bff3071e9fb893e4c97bc55aeb2196e2b6e9e363ac6235379b80e7cfc7e
   languageName: node
   linkType: hard
 
@@ -13235,14 +13398,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^0.28.0":
+  version: 0.28.1
+  resolution: "axios@npm:0.28.1"
+  dependencies:
+    follow-redirects: "npm:^1.15.0"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 10/3eb6799ce716de877c3015ddc2cbb5d5176c914d777c36076e097157792f2bc6d0a491156a9239bf32e8dfe1c138ec008d6bd31f4c5602d8e7b915111c10b635
+  languageName: node
+  linkType: hard
+
 "axios@npm:^1.1.3":
-  version: 1.7.4
-  resolution: "axios@npm:1.7.4"
+  version: 1.7.7
+  resolution: "axios@npm:1.7.7"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10/7a1429be1e3d0c2e1b96d4bba4d113efbfabc7c724bed107beb535c782c7bea447ff634886b0c7c43395a264d085450d009eb1154b5f38a8bae49d469fdcbc61
+  checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1
   languageName: node
   linkType: hard
 
@@ -15995,7 +16169,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-js@npm:^4.2.0":
+"crypto-js@npm:4.2.0, crypto-js@npm:^4.2.0":
   version: 4.2.0
   resolution: "crypto-js@npm:4.2.0"
   checksum: 10/c7bcc56a6e01c3c397e95aa4a74e4241321f04677f9a618a8f48a63b5781617248afb9adb0629824792e7ec20ca0d4241a49b6b2938ae6f973ec4efc5c53c924
@@ -17480,6 +17654,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eip55@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "eip55@npm:2.1.1"
+  dependencies:
+    keccak: "npm:^3.0.3"
+  checksum: 10/512d319e4f91ab0c33b514f371206956521dcdcdd23e8eb4d6f9c21e3be9f72287c0b82feb854d3a1eec91805804d13c31e7a1a7dafd37f69eb9994a9c6c8f32
+  languageName: node
+  linkType: hard
+
 "ejs@npm:^3.1.5, ejs@npm:^3.1.8":
   version: 3.1.9
   resolution: "ejs@npm:3.1.9"
@@ -18871,7 +19054,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethers@npm:^5.7.0, ethers@npm:^5.7.2":
+"ethers@npm:5.7.2, ethers@npm:^5.7.0, ethers@npm:^5.7.2":
   version: 5.7.2
   resolution: "ethers@npm:5.7.2"
   dependencies:
@@ -19988,13 +20171,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6":
-  version: 1.15.6
-  resolution: "follow-redirects@npm:1.15.6"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6":
+  version: 1.15.9
+  resolution: "follow-redirects@npm:1.15.9"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 10/70c7612c4cab18e546e36b991bbf8009a1a41cf85354afe04b113d1117569abf760269409cb3eb842d9f7b03d62826687086b081c566ea7b1e6613cf29030bf7
+  checksum: 10/e3ab42d1097e90d28b913903841e6779eb969b62a64706a3eb983e894a5db000fbd89296f45f08885a0e54cd558ef62e81be1165da9be25a6c44920da10f424c
   languageName: node
   linkType: hard
 
@@ -24930,7 +25113,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keccak@npm:^3.0.0":
+"keccak@npm:^3.0.0, keccak@npm:^3.0.3":
   version: 3.0.4
   resolution: "keccak@npm:3.0.4"
   dependencies:
@@ -26535,7 +26718,7 @@ __metadata:
     "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
     "@metamask/eth-json-rpc-filters": "npm:^9.0.0"
     "@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch"
-    "@metamask/eth-ledger-bridge-keyring": "npm:^3.0.1"
+    "@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:^4.4.0"
@@ -36741,6 +36924,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"utility-types@npm:^3.10.0":
+  version: 3.11.0
+  resolution: "utility-types@npm:3.11.0"
+  checksum: 10/a3c51463fc807ed04ccc8b5d0fa6e31f3dcd7a4cbd30ab4bc6d760ce5319dd493d95bf04244693daf316f97e9ab2a37741edfed8748ad38572a595398ad0fdaf
+  languageName: node
+  linkType: hard
+
 "utils-merge@npm:1.0.1":
   version: 1.0.1
   resolution: "utils-merge@npm:1.0.1"

From 54a97438ee173b25884739a0c4663bca833437ca Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Wed, 13 Nov 2024 08:18:41 +0100
Subject: [PATCH 081/111] test: [POM] Migrate autodetect and import nft e2e
 tests to use Page Object Model (#28383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate e2e tests `test/e2e/tests/tokens/nft/auto-detect-nft.spec.js`
to TS and Page Object Model, to reduce flakiness.
- Migrate e2e tests `test/e2e/tests/tokens/nft/import-nft.spec.js` to TS
and Page Object Model, to reduce flakiness.
- Create page classe functions for nft
- Deprecate/remove old functions in `helper.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/28388

## **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/pages/homepage.ts       |  85 +++++++-
 .../pages/settings/privacy-settings.ts        |  24 ++-
 .../pages/settings/settings-page.ts           |   8 +
 .../nft-token-send-redesign.spec.ts           |   4 +-
 .../tests/tokens/nft/auto-detect-nft.spec.js  |  57 ------
 .../tests/tokens/nft/auto-detect-nft.spec.ts  |  49 +++++
 test/e2e/tests/tokens/nft/import-nft.spec.js  | 189 ------------------
 test/e2e/tests/tokens/nft/import-nft.spec.ts  | 111 ++++++++++
 8 files changed, 265 insertions(+), 262 deletions(-)
 delete mode 100644 test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
 create mode 100644 test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
 delete mode 100644 test/e2e/tests/tokens/nft/import-nft.spec.js
 create mode 100644 test/e2e/tests/tokens/nft/import-nft.spec.ts

diff --git a/test/e2e/page-objects/pages/homepage.ts b/test/e2e/page-objects/pages/homepage.ts
index 101e6f9de83c..89a32a550cc9 100644
--- a/test/e2e/page-objects/pages/homepage.ts
+++ b/test/e2e/page-objects/pages/homepage.ts
@@ -11,10 +11,6 @@ class HomePage {
   private readonly activityTab =
     '[data-testid="account-overview__activity-tab"]';
 
-  private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
-
-  private readonly nftIconOnActivityList = '[data-testid="nft-item"]';
-
   private readonly balance = '[data-testid="eth-overview__primary-currency"]';
 
   private readonly basicFunctionalityOffWarningMessage = {
@@ -48,6 +44,27 @@ class HomePage {
   private readonly transactionAmountsInActivity =
     '[data-testid="transaction-list-item-primary-currency"]';
 
+  // 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 successImportNftMessage = {
+    text: 'NFT was successfully added!',
+    tag: 'h6',
+  };
+
   constructor(driver: Driver) {
     this.driver = driver;
     this.headerNavbar = new HeaderNavbar(driver);
@@ -84,8 +101,8 @@ class HomePage {
     await this.driver.clickElement(this.activityTab);
   }
 
-  async goToNFTList(): Promise<void> {
-    console.log(`Open NFT tab on homepage`);
+  async goToNftTab(): Promise<void> {
+    console.log(`Go to NFT tab on homepage`);
     await this.driver.clickElement(this.nftTab);
   }
 
@@ -97,6 +114,35 @@ class HomePage {
     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,
+      );
+    }
+  }
+
   /**
    * Checks if the toaster message for adding a network is displayed on the homepage.
    *
@@ -167,6 +213,11 @@ class 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.
    *
@@ -244,6 +295,28 @@ class HomePage {
     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);
+  }
+
   /**
    * This function checks if a specified transaction amount at the specified index matches the expected one.
    *
diff --git a/test/e2e/page-objects/pages/settings/privacy-settings.ts b/test/e2e/page-objects/pages/settings/privacy-settings.ts
index 013ed65e4572..ab0486d2003e 100644
--- a/test/e2e/page-objects/pages/settings/privacy-settings.ts
+++ b/test/e2e/page-objects/pages/settings/privacy-settings.ts
@@ -5,27 +5,30 @@ import { tEn } from '../../../../lib/i18n-helpers';
 class PrivacySettings {
   private readonly driver: Driver;
 
-  private readonly privacySettingsPageTitle = {
-    text: 'Security & privacy',
-    tag: 'h4',
-  };
+  private readonly autodetectNftToggleButton =
+    '[data-testid="useNftDetection"] .toggle-button > div';
 
-  // SRP related locators
   private readonly closeRevealSrpDialogButton = {
     text: tEn('close'),
     tag: 'button',
   };
 
+  private readonly copiedSrpExclamation = {
+    text: tEn('copiedExclamation'),
+    tag: 'button',
+  };
+
   private readonly copySrpButton = {
     text: tEn('copyToClipboard'),
     tag: 'button',
   };
 
-  private readonly copiedSrpExclamation = {
-    text: tEn('copiedExclamation'),
-    tag: 'button',
+  private readonly privacySettingsPageTitle = {
+    text: 'Security & privacy',
+    tag: 'h4',
   };
 
+  // reveal SRP related locators
   private readonly displayedSrpText = '[data-testid="srp_text"]';
 
   private readonly holdToRevealSRPButton = {
@@ -172,6 +175,11 @@ class PrivacySettings {
     await this.driver.waitForSelector(this.revealSrpQuizModalTitle);
   }
 
+  async toggleAutodetectNft(): Promise<void> {
+    console.log('Toggle autodetect NFT on privacy settings page');
+    await this.driver.clickElement(this.autodetectNftToggleButton);
+  }
+
   async check_displayedSrpCanBeCopied(): Promise<void> {
     console.log('Check displayed SRP on privacy settings page can be copied');
     await this.driver.clickElement(this.copySrpButton);
diff --git a/test/e2e/page-objects/pages/settings/settings-page.ts b/test/e2e/page-objects/pages/settings/settings-page.ts
index 24b3f2294085..d103aca83f97 100644
--- a/test/e2e/page-objects/pages/settings/settings-page.ts
+++ b/test/e2e/page-objects/pages/settings/settings-page.ts
@@ -3,6 +3,9 @@ import { Driver } from '../../../webdriver/driver';
 class SettingsPage {
   private readonly driver: Driver;
 
+  private readonly closeSettingsPageButton =
+    '.settings-page__header__title-container__close-button';
+
   private readonly developerOptionsButton = {
     text: 'Developer Options',
     css: '.tab-bar__tab__content__title',
@@ -37,6 +40,11 @@ class SettingsPage {
     console.log('Settings page is loaded');
   }
 
+  async closeSettingsPage(): Promise<void> {
+    console.log('Closing Settings page');
+    await this.driver.clickElement(this.closeSettingsPageButton);
+  }
+
   async goToDevelopOptionSettings(): Promise<void> {
     console.log('Navigating to Develop options page');
     await this.driver.clickElement(this.developerOptionsButton);
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 4f6093e349f2..b7902717a787 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
@@ -207,7 +207,7 @@ async function createERC721WalletInitiatedTransactionAndAssertDetails(
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
 
   const homePage = new HomePage(driver);
-  await homePage.goToNFTList();
+  await homePage.goToNftTab();
   await homePage.clickNFTIconOnActivityList();
 
   const nftDetailsPage = new NFTDetailsPage(driver);
@@ -296,7 +296,7 @@ async function createERC1155WalletInitiatedTransactionAndAssertDetails(
 
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
   const homePage = new HomePage(driver);
-  await homePage.goToNFTList();
+  await homePage.goToNftTab();
   await homePage.clickNFTIconOnActivityList();
 
   const nftDetailsPage = new NFTDetailsPage(driver);
diff --git a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
deleted file mode 100644
index ccd15ce0f71b..000000000000
--- a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  defaultGanacheOptions,
-  openMenuSafe,
-  unlockWallet,
-  withFixtures,
-} = require('../../../helpers');
-const FixtureBuilder = require('../../../fixture-builder');
-const { setupAutoDetectMocking } = require('./mocks');
-
-describe('NFT detection', function () {
-  /**
-   * TODO Revisit this test once we enable nft auto detection by default. Use .withPreferencesControllerNftDetectionEnabled().
-   */
-  it('displays NFT media', async function () {
-    const driverOptions = { mock: true };
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
-        driverOptions,
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: setupAutoDetectMocking,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // go to settings
-        await openMenuSafe(driver);
-
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({ text: 'Security & privacy', tag: 'div' });
-        await driver.clickElement(
-          '[data-testid="useNftDetection"] .toggle-button > div',
-        );
-        await driver.clickElement(
-          '.settings-page__header__title-container__close-button',
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__asset-tab"]',
-        );
-
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.delay(1000);
-        const collection = await driver.findElement(
-          '[data-testid="collection-expander-button"]',
-        );
-        const nftImage = await driver.findElement('[data-testid="nft-item"]');
-        assert.equal(
-          await collection.getText(),
-          'ENS: Ethereum Name Service (1)',
-        );
-        assert.equal(await nftImage.isDisplayed(), true);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
new file mode 100644
index 000000000000..c70a3860dd63
--- /dev/null
+++ b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
@@ -0,0 +1,49 @@
+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 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';
+import { setupAutoDetectMocking } from './mocks';
+
+describe('NFT detection', function () {
+  /**
+   * TODO Revisit this test once we enable nft auto detection by default. Use .withPreferencesControllerNftDetectionEnabled().
+   */
+  it('displays NFT media', async function () {
+    const driverOptions = { mock: true };
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
+        driverOptions,
+        title: this.test?.fullTitle(),
+        testSpecificMock: setupAutoDetectMocking,
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        // navigate to security & privacy settings and toggle on NFT autodetection
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+        await privacySettings.toggleAutodetectNft();
+        await settingsPage.closeSettingsPage();
+
+        // check that nft is displayed
+        const homepage = new Homepage(driver);
+        await homepage.check_pageIsLoaded();
+        await homepage.check_expectedBalanceIsDisplayed();
+        await homepage.goToNftTab();
+        await homepage.check_nftNameIsDisplayed(
+          'ENS: Ethereum Name Service (1)',
+        );
+        await homepage.check_nftImageIsDisplayed();
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/tokens/nft/import-nft.spec.js b/test/e2e/tests/tokens/nft/import-nft.spec.js
deleted file mode 100644
index 7d10c0fba3c6..000000000000
--- a/test/e2e/tests/tokens/nft/import-nft.spec.js
+++ /dev/null
@@ -1,189 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  defaultGanacheOptions,
-  withFixtures,
-  unlockWallet,
-  findAnotherAccountFromAccountList,
-  locateAccountBalanceDOM,
-} = require('../../../helpers');
-const { SMART_CONTRACTS } = require('../../../seeder/smart-contracts');
-const FixtureBuilder = require('../../../fixture-builder');
-
-describe('Import NFT', function () {
-  const smartContract = SMART_CONTRACTS.NFTS;
-
-  it('should be able to import an NFT that user owns', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contractAddress =
-          contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        // After login, go to NFTs tab, open the import NFT form
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.clickElement({ text: 'Import NFT', tag: 'button' });
-
-        // Enter a valid NFT that belongs to user and check success message appears
-        await driver.fill('#address', contractAddress);
-        await driver.fill('#token-id', '1');
-        await driver.clickElement(
-          '[data-testid="import-nfts-modal-import-button"]',
-        );
-
-        const newNftNotification = await driver.findElement({
-          text: 'NFT was successfully added!',
-          tag: 'h6',
-        });
-        assert.equal(await newNftNotification.isDisplayed(), true);
-
-        // Check the imported NFT and its image are displayed in the NFT tab
-        const importedNft = await driver.waitForSelector({
-          css: 'h5',
-          text: 'TestDappNFTs',
-        });
-        const importedNftImage = await driver.findElement(
-          '.nft-item__container',
-        );
-        assert.equal(await importedNft.isDisplayed(), true);
-        assert.equal(await importedNftImage.isDisplayed(), true);
-      },
-    );
-  });
-
-  it('should continue to display an imported NFT after importing, adding a new account, and switching back', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer, contractRegistry }) => {
-        const contractAddress =
-          contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        // After login, go to NFTs tab, open the import NFT form
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.clickElement({ text: 'Import NFT', tag: 'button' });
-
-        // Enter a valid NFT that belongs to user and check success message appears
-        await driver.fill('#address', contractAddress);
-        await driver.fill('#token-id', '1');
-        await driver.clickElementAndWaitToDisappear(
-          '[data-testid="import-nfts-modal-import-button"]',
-        );
-
-        const newNftNotification = await driver.findElement({
-          text: 'NFT was successfully added!',
-          tag: 'h6',
-        });
-        assert.equal(await newNftNotification.isDisplayed(), true);
-
-        // Check the imported NFT and its image are displayed in the NFT tab
-        const importedNft = await driver.waitForSelector({
-          css: 'h5',
-          text: 'TestDappNFTs',
-        });
-        const importedNftImage = await driver.findElement(
-          '.nft-item__container',
-        );
-        assert.equal(await importedNft.isDisplayed(), true);
-        assert.equal(await importedNftImage.isDisplayed(), true);
-
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement({
-          text: 'Add a new Ethereum account',
-          tag: 'button',
-        });
-
-        // By clicking creating button without filling in the account name
-        // the default name would be set as Account 2
-        await driver.clickElement(
-          '[data-testid="submit-add-account-with-name"]',
-        );
-
-        await driver.isElementPresent({
-          tag: 'span',
-          text: 'Account 2',
-        });
-        const accountOneSelector = await findAnotherAccountFromAccountList(
-          driver,
-          1,
-          'Account 1',
-        );
-
-        await driver.clickElement(accountOneSelector);
-        await locateAccountBalanceDOM(driver, ganacheServer);
-        const nftIsStillDisplayed = await driver.isElementPresentAndVisible({
-          css: 'h5',
-          text: 'TestDappNFTs',
-        });
-        const nftImageIsStillDisplayed =
-          await driver.isElementPresentAndVisible('.nft-item__container');
-        assert.equal(
-          nftIsStillDisplayed,
-          true,
-          'Nft is no longer displayed after adding an account and switching back to account 1',
-        );
-        assert.equal(
-          nftImageIsStillDisplayed,
-          true,
-          'Nft image is no longer displayed after adding an account and switching back to account 1',
-        );
-      },
-    );
-  });
-
-  it('should not be able to import an NFT that does not belong to user', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contractAddress =
-          contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        // After login, go to NFTs tab, open the import NFT form
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.clickElement({ text: 'Import NFT', tag: 'button' });
-
-        // Enter an NFT that not belongs to user with a valid address and an invalid token id
-        await driver.fill('#address', contractAddress);
-        await driver.fill('#token-id', '2');
-        await driver.clickElement(
-          '[data-testid="import-nfts-modal-import-button"]',
-        );
-
-        // Check error message appears
-        const invalidNftNotification = await driver.findElement({
-          text: 'NFT can’t be added as the ownership details do not match. Make sure you have entered correct information.',
-          tag: 'p',
-        });
-        assert.equal(await invalidNftNotification.isDisplayed(), true);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/tokens/nft/import-nft.spec.ts b/test/e2e/tests/tokens/nft/import-nft.spec.ts
new file mode 100644
index 000000000000..73049a8c9d0d
--- /dev/null
+++ b/test/e2e/tests/tokens/nft/import-nft.spec.ts
@@ -0,0 +1,111 @@
+import { defaultGanacheOptions, withFixtures } from '../../../helpers';
+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 { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
+
+describe('Import NFT', function () {
+  const smartContract = SMART_CONTRACTS.NFTS;
+
+  it('should be able to import an NFT that user owns', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver, ganacheServer, contractRegistry }) => {
+        const contractAddress =
+          contractRegistry.getContractAddress(smartContract);
+        await loginWithBalanceValidation(driver, ganacheServer);
+
+        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();
+      },
+    );
+  });
+
+  it('should continue to display an imported NFT after importing, adding a new account, and switching back', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver, ganacheServer, contractRegistry }) => {
+        const contractAddress =
+          contractRegistry.getContractAddress(smartContract);
+        await loginWithBalanceValidation(driver, ganacheServer);
+
+        // 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();
+
+        // Create new account with default name Account 2
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.addNewAccountWithDefaultName();
+        await headerNavbar.check_accountLabel('Account 2');
+        await homepage.check_expectedBalanceIsDisplayed();
+
+        // Switch back to Account 1 and check that the NFT is still displayed
+        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_ganacheBalanceIsDisplayed(ganacheServer);
+        await homepage.check_nftNameIsDisplayed('TestDappNFTs');
+        await homepage.check_nftImageIsDisplayed();
+      },
+    );
+  });
+
+  it('should not be able to import an NFT that does not belong to user', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        smartContract,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver, ganacheServer, contractRegistry }) => {
+        const contractAddress =
+          contractRegistry.getContractAddress(smartContract);
+        await loginWithBalanceValidation(driver, ganacheServer);
+
+        const homepage = new Homepage(driver);
+        await homepage.goToNftTab();
+        await homepage.importNft(
+          contractAddress,
+          '2',
+          'NFT can’t be added as the ownership details do not match. Make sure you have entered correct information.',
+        );
+      },
+    );
+  });
+});

From 8368b8987c293cfbbb36ef11c727ee9636bb1494 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:31:27 +0100
Subject: [PATCH 082/111] test: fix state fixtures race condition (#28421)
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**
There is a race condition in our testing setup, which causes that the
expected fixtures state, not being there when we start the test. This
has been surfaced in [this
branch](https://github.com/MetaMask/metamask-extension/pull/28277),
where the account tracker multi polling is being added.
The problem is that if we don't have the AccountTracker in state when
the `resetState` function is called (at the beginning of wallet loading)
the balance will remain loading until we refresh the wallet.

Edit: performing the load state early in the test setup fixes the issue.

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

## **Related issues**

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

## **Manual testing steps**

1. Check all tests continue to pass
2. Check this changes fix this branch ENS test
https://github.com/MetaMask/metamask-extension/pull/28402/files#diff-1acb7898d60977530c97169551d22dbe477a4e3aeb74f1f14bf2eea0b4d75d35
. Alternatively, see videos below with before and after behaviours

## **Screenshots/Recordings**

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

### **Before**




https://github.com/user-attachments/assets/8f50ec04-cf96-478e-9c3c-dce54254a628



### **After**


https://github.com/user-attachments/assets/0f109b1a-9289-48d9-b337-d51890c9d448




## **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/helpers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index f4a5251b1ccf..4bec0737472f 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -119,6 +119,9 @@ async function withFixtures(options, testSuite) {
       contractRegistry = ganacheSeeder.getContractRegistry();
     }
 
+    await fixtureServer.start();
+    fixtureServer.loadJsonState(fixtures, contractRegistry);
+
     if (ganacheOptions?.concurrent) {
       ganacheOptions.concurrent.forEach(async (ganacheSettings) => {
         const { port, chainId, ganacheOptions2 } = ganacheSettings;
@@ -138,8 +141,6 @@ async function withFixtures(options, testSuite) {
       await initBundler(bundlerServer, ganacheServer, usePaymaster);
     }
 
-    await fixtureServer.start();
-    fixtureServer.loadJsonState(fixtures, contractRegistry);
     await phishingPageServer.start();
     if (dapp) {
       if (dappOptions?.numberOfDapps) {

From caf6b24feaf84d10b3eab0d736fe3c08a3c47bbd Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Wed, 13 Nov 2024 16:59:27 +0800
Subject: [PATCH 083/111] feat: btc send flow e2e (#28340)
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 reintroduces the happy path send flow tests for BTC

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/668

## **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: Charly Chevalier <charly.chevalier@consensys.net>
---
 test/e2e/constants.ts                         |  13 ++
 test/e2e/flask/btc/btc-send.spec.ts           | 163 ++++++++++++++++++
 test/e2e/flask/btc/common-btc.ts              | 158 ++++++++++++++++-
 .../app/wallet-overview/coin-buttons.tsx      |  26 ++-
 4 files changed, 347 insertions(+), 13 deletions(-)
 create mode 100644 test/e2e/flask/btc/btc-send.spec.ts

diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index a1388b93a512..7123d3e4114a 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -51,6 +51,19 @@ export const DEFAULT_BTC_ACCOUNT = 'bc1qg6whd6pc0cguh6gpp3ewujm53hv32ta9hdp252';
 /* Default (mocked) BTC balance used by the Bitcoin RPC provider */
 export const DEFAULT_BTC_BALANCE = 1; // BTC
 
+/* Default BTC fees rate */
+export const DEFAULT_BTC_FEES_RATE = 0.00001; // BTC
+
+/* Default BTC conversion rate to USD */
+export const DEFAULT_BTC_CONVERSION_RATE = 62000; // USD
+
+/* Default BTC transaction ID */
+export const DEFAULT_BTC_TRANSACTION_ID =
+  'e4111a707317da67d49a71af4cbcf6c0546f900ca32c3842d2254e315d1fca18';
+
+/* Number of sats in 1 BTC */
+export const SATS_IN_1_BTC = 100000000; // sats
+
 /* Default (mocked) SOLANA address created using test SRP */
 export const DEFAULT_SOLANA_ACCOUNT =
   'E6Aa9DDv7zsePJHosoqiNb3cFuup3fkXTyRH2pZ1nVzP';
diff --git a/test/e2e/flask/btc/btc-send.spec.ts b/test/e2e/flask/btc/btc-send.spec.ts
new file mode 100644
index 000000000000..71d58c5c41ea
--- /dev/null
+++ b/test/e2e/flask/btc/btc-send.spec.ts
@@ -0,0 +1,163 @@
+import { strict as assert } from 'assert';
+import { Suite } from 'mocha';
+import { Driver } from '../../webdriver/driver';
+import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
+import {
+  getTransactionRequest,
+  SendFlowPlaceHolders,
+  withBtcAccountSnap,
+} from './common-btc';
+
+export async function startSendFlow(driver: Driver, recipient?: string) {
+  // Wait a bit so the MultichainRatesController is able to fetch BTC -> USD rates.
+  await driver.delay(1000);
+
+  // Start the send flow.
+  const sendButton = await driver.waitForSelector({
+    text: 'Send',
+    tag: 'button',
+    css: '[data-testid="coin-overview-send"]',
+  });
+  // FIXME: Firefox test is flaky without this delay. The send flow doesn't start properly.
+  if (driver.browser === 'firefox') {
+    await driver.delay(1000);
+  }
+  await sendButton.click();
+
+  // See the review button is disabled by default.
+  await driver.waitForSelector({
+    text: 'Review',
+    tag: 'button',
+    css: '[disabled]',
+  });
+
+  if (recipient) {
+    // Set the recipient address (if any).
+    await driver.pasteIntoField(
+      `input[placeholder="${SendFlowPlaceHolders.RECIPIENT}"]`,
+      recipient,
+    );
+  }
+}
+
+describe('BTC Account - Send', function (this: Suite) {
+  it('can send complete the send flow', async function () {
+    await withBtcAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver, mockServer) => {
+        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
+
+        // TODO: Remove delay here. There is a race condition if the amount and address are set too fast.
+        await driver.delay(1000);
+
+        // Set the amount to send.
+        const mockAmountToSend = '0.5';
+        await driver.pasteIntoField(
+          `input[placeholder="${SendFlowPlaceHolders.AMOUNT}"]`,
+          mockAmountToSend,
+        );
+
+        // From here, the "summary panel" should have some information about the fees and total.
+        await driver.waitForSelector({
+          text: 'Total',
+          tag: 'p',
+        });
+
+        // The review button will become available.
+        const snapReviewButton = await driver.findClickableElement({
+          text: 'Review',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapReviewButton.isEnabled(), true);
+        await snapReviewButton.click();
+
+        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
+        // We already have unit tests for these calculations on the Snap.
+
+        // ------------------------------------------------------------------------------
+        // From here, we have moved to the confirmation screen (second part of the flow).
+
+        // We should be able to send the transaction right away.
+        const snapSendButton = await driver.waitForSelector({
+          text: 'Send',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapSendButton.isEnabled(), true);
+        await snapSendButton.click();
+
+        // Check that we are selecting the "Activity tab" right after the send.
+        await driver.waitForSelector({
+          tag: 'div',
+          text: 'Bitcoin activity is not supported',
+        });
+
+        const transaction = await getTransactionRequest(mockServer);
+        assert(transaction !== undefined);
+      },
+    );
+  });
+
+  it('can send the max amount', async function () {
+    await withBtcAccountSnap(
+      { title: this.test?.fullTitle() },
+      async (driver, mockServer) => {
+        await startSendFlow(driver, DEFAULT_BTC_ACCOUNT);
+
+        // TODO: Remove delay here. There is a race condition if the amount and address are set too fast.
+        await driver.delay(1000);
+
+        // Use the max spendable amount of that account.
+        await driver.clickElement({
+          text: 'Max',
+          tag: 'button',
+        });
+
+        // From here, the "summary panel" should have some information about the fees and total.
+        await driver.waitForSelector({
+          text: 'Total',
+          tag: 'p',
+        });
+
+        await driver.waitForSelector({
+          text: `${DEFAULT_BTC_BALANCE} BTC`,
+          tag: 'p',
+        });
+
+        // The review button will become available.
+        const snapReviewButton = await driver.findClickableElement({
+          text: 'Review',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapReviewButton.isEnabled(), true);
+        await snapReviewButton.click();
+
+        // TODO: There isn't any check for the fees and total amount. This requires calculating the vbytes used in a transaction dynamically.
+        // We already have unit tests for these calculations on the snap.
+
+        // ------------------------------------------------------------------------------
+        // From here, we have moved to the confirmation screen (second part of the flow).
+
+        // We should be able to send the transaction right away.
+        const snapSendButton = await driver.waitForSelector({
+          text: 'Send',
+          tag: 'button',
+          css: '.snap-ui-renderer__footer-button',
+        });
+        assert.equal(await snapSendButton.isEnabled(), true);
+        await snapSendButton.click();
+
+        // Check that we are selecting the "Activity tab" right after the send.
+        await driver.waitForSelector({
+          tag: 'div',
+          text: 'Bitcoin activity is not supported',
+        });
+
+        const transaction = await getTransactionRequest(mockServer);
+        assert(transaction !== undefined);
+      },
+    );
+  });
+});
diff --git a/test/e2e/flask/btc/common-btc.ts b/test/e2e/flask/btc/common-btc.ts
index 6891b3bfd60e..452f9ad44f6b 100644
--- a/test/e2e/flask/btc/common-btc.ts
+++ b/test/e2e/flask/btc/common-btc.ts
@@ -1,11 +1,26 @@
 import { Mockttp } from 'mockttp';
 import FixtureBuilder from '../../fixture-builder';
 import { withFixtures, unlockWallet } from '../../helpers';
-import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
+import {
+  DEFAULT_BTC_ACCOUNT,
+  DEFAULT_BTC_BALANCE,
+  DEFAULT_BTC_FEES_RATE,
+  DEFAULT_BTC_TRANSACTION_ID,
+  DEFAULT_BTC_CONVERSION_RATE,
+  SATS_IN_1_BTC,
+} from '../../constants';
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
 import { Driver } from '../../webdriver/driver';
 import messages from '../../../../app/_locales/en/messages.json';
 
+const QUICKNODE_URL_REGEX = /^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u;
+
+export enum SendFlowPlaceHolders {
+  AMOUNT = 'Enter amount to send',
+  RECIPIENT = 'Enter receiving address',
+  LOADING = 'Preparing transaction',
+}
+
 export async function createBtcAccount(driver: Driver) {
   await driver.clickElement('[data-testid="account-menu-icon"]');
   await driver.clickElement(
@@ -27,12 +42,17 @@ export async function createBtcAccount(driver: Driver) {
   );
 }
 
+export function btcToSats(btc: number): number {
+  // Watchout, we're not using BigNumber(s) here (but that's ok for test purposes)
+  return btc * SATS_IN_1_BTC;
+}
+
 export async function mockBtcBalanceQuote(
   mockServer: Mockttp,
   address: string = DEFAULT_BTC_ACCOUNT,
 ) {
   return await mockServer
-    .forPost(/^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u)
+    .forPost(QUICKNODE_URL_REGEX)
     .withJsonBodyIncluding({
       method: 'bb_getaddress',
     })
@@ -42,7 +62,7 @@ export async function mockBtcBalanceQuote(
         json: {
           result: {
             address,
-            balance: (DEFAULT_BTC_BALANCE * 1e8).toString(), // Converts from BTC to sats
+            balance: btcToSats(DEFAULT_BTC_BALANCE).toString(), // Converts from BTC to sats
             totalReceived: '0',
             totalSent: '0',
             unconfirmedBalance: '0',
@@ -54,6 +74,105 @@ export async function mockBtcBalanceQuote(
     });
 }
 
+export async function mockBtcFeeCallQuote(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'estimatesmartfee',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: {
+            blocks: 1,
+            feerate: DEFAULT_BTC_FEES_RATE, // sats
+          },
+        },
+      };
+    });
+}
+
+export async function mockMempoolInfo(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'getmempoolinfo',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: {
+            loaded: true,
+            size: 165194,
+            bytes: 93042828,
+            usage: 550175264,
+            total_fee: 1.60127931,
+            maxmempool: 2048000000,
+            mempoolminfee: DEFAULT_BTC_FEES_RATE,
+            minrelaytxfee: DEFAULT_BTC_FEES_RATE,
+            incrementalrelayfee: 0.00001,
+            unbroadcastcount: 0,
+            fullrbf: true,
+          },
+        },
+      };
+    });
+}
+
+export async function mockGetUTXO(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'bb_getutxos',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: [
+            {
+              txid: DEFAULT_BTC_TRANSACTION_ID,
+              vout: 0,
+              value: btcToSats(DEFAULT_BTC_BALANCE).toString(),
+              height: 101100110,
+              confirmations: 6,
+            },
+          ],
+        },
+      };
+    });
+}
+
+export async function mockSendTransaction(mockServer: Mockttp) {
+  return await mockServer
+    .forPost(QUICKNODE_URL_REGEX)
+    .withJsonBodyIncluding({
+      method: 'sendrawtransaction',
+    })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          result: DEFAULT_BTC_TRANSACTION_ID,
+        },
+      };
+    });
+}
+
+export async function mockRatesCall(mockServer: Mockttp) {
+  return await mockServer
+    .forGet('https://min-api.cryptocompare.com/data/pricemulti')
+    .withQuery({ fsyms: 'btc', tsyms: 'usd,USD' })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: { BTC: { USD: DEFAULT_BTC_CONVERSION_RATE } },
+      };
+    });
+}
+
 export async function mockRampsDynamicFeatureFlag(
   mockServer: Mockttp,
   subDomain: string,
@@ -87,7 +206,7 @@ export async function withBtcAccountSnap(
     title,
     bitcoinSupportEnabled,
   }: { title?: string; bitcoinSupportEnabled?: boolean },
-  test: (driver: Driver) => Promise<void>,
+  test: (driver: Driver, mockServer: Mockttp) => Promise<void>,
 ) {
   await withFixtures(
     {
@@ -99,17 +218,44 @@ export async function withBtcAccountSnap(
       title,
       dapp: true,
       testSpecificMock: async (mockServer: Mockttp) => [
+        await mockRatesCall(mockServer),
         await mockBtcBalanceQuote(mockServer),
         // See: PROD_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'api'),
         // See: UAT_RAMP_API_BASE_URL
         await mockRampsDynamicFeatureFlag(mockServer, 'uat-api'),
+        await mockMempoolInfo(mockServer),
+        await mockBtcFeeCallQuote(mockServer),
+        await mockGetUTXO(mockServer),
+        await mockSendTransaction(mockServer),
       ],
     },
-    async ({ driver }: { driver: Driver }) => {
+    async ({ driver, mockServer }: { driver: Driver; mockServer: Mockttp }) => {
       await unlockWallet(driver);
       await createBtcAccount(driver);
-      await test(driver);
+      await test(driver, mockServer);
+    },
+  );
+}
+
+export async function getQuickNodeSeenRequests(mockServer: Mockttp) {
+  const seenRequests = await Promise.all(
+    (
+      await mockServer.getMockedEndpoints()
+    ).map((mockedEndpoint) => mockedEndpoint.getSeenRequests()),
+  );
+  return seenRequests
+    .flat()
+    .filter((request) => request.url.match(QUICKNODE_URL_REGEX));
+}
+
+export async function getTransactionRequest(mockServer: Mockttp) {
+  // Check that the transaction has been sent.
+  const transactionRequest = (await getQuickNodeSeenRequests(mockServer)).find(
+    async (request) => {
+      const body = (await request.body.getJson()) as { method: string };
+      return body.method === 'sendrawtransaction';
     },
   );
+  return transactionRequest;
 }
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index 3a499aa44dbf..88696a14e83f 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -132,6 +132,12 @@ const CoinButtons = ({
 
   const { address: selectedAddress } = account;
   const history = useHistory();
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  const currentActivityTabName = useSelector(
+    // @ts-expect-error TODO: fix state type
+    (state) => state.metamask.defaultHomeActiveTabName,
+  );
+  ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const location = useLocation();
   const keyring = useSelector(getCurrentKeyring);
@@ -328,14 +334,20 @@ const CoinButtons = ({
     switch (account.type) {
       ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
       case BtcAccountType.P2wpkh: {
-        await sendMultichainTransaction(
-          BITCOIN_WALLET_SNAP_ID,
-          account.id,
-          chainId as CaipChainId,
-        );
+        try {
+          // FIXME: We switch the tab before starting the send flow (we
+          // faced some inconsistencies when changing it after).
+          await dispatch(setDefaultHomeActiveTabName('activity'));
+          await sendMultichainTransaction(
+            BITCOIN_WALLET_SNAP_ID,
+            account.id,
+            chainId as CaipChainId,
+          );
+        } catch {
+          // Restore the previous tab in case of any error (see FIXME comment above).
+          await dispatch(setDefaultHomeActiveTabName(currentActivityTabName));
+        }
 
-        // We automatically switch to the activity tab once the transaction has been sent.
-        dispatch(setDefaultHomeActiveTabName('activity'));
         break;
       }
       ///: END:ONLY_INCLUDE_IF

From 6bb750a7817e17575fdfa20b20b02c6badb94278 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Wed, 13 Nov 2024 14:12:18 +0000
Subject: [PATCH 084/111] fix: Default to dApp suggested fees only when user
 selects the option (#28403)
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**

Previously, some gas fee parameters defaulted to dApp suggested fee
values. This was problematic, because these values are always defined,
even when the user changed to a custom priority.

To fix the issue, we now only show the fees contained in txParams,
trusting they match the user selected priority level in the gas fees
modal.

<!--
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/28403?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

See screen recording below.

## **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/3874d3b6-ad96-4fd9-9f40-361b38a0253b



### **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.
---
 .../confirm/info/__snapshots__/info.test.tsx.snap  |  4 ++--
 .../approve/__snapshots__/approve.test.tsx.snap    |  6 +++---
 .../confirm/info/hooks/useEIP1559TxFees.ts         |  6 ++----
 .../confirm/info/hooks/useFeeCalculations.ts       | 13 ++++++++-----
 .../info/hooks/useTransactionGasFeeEstimate.ts     | 14 ++++----------
 .../__snapshots__/native-transfer.test.tsx.snap    |  2 +-
 .../__snapshots__/nft-token-transfer.test.tsx.snap |  2 +-
 .../set-approval-for-all-info.test.tsx.snap        |  2 +-
 .../__snapshots__/token-transfer.test.tsx.snap     |  2 +-
 9 files changed, 23 insertions(+), 28 deletions(-)

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 38219749e987..f0c3a5183789 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
@@ -102,7 +102,7 @@ exports[`Info renders info section for approve request 1`] = `
           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
+          $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"
@@ -819,7 +819,7 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
           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
+          $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"
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 8b5e0c683b51..4b5c87fda337 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
@@ -483,7 +483,7 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
           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
+          $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"
@@ -582,12 +582,12 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
         >
-          0.0011 ETH
+          0.0023 ETH
         </p>
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
         >
-          $0.60
+          $1.26
         </p>
       </div>
     </div>
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useEIP1559TxFees.ts b/ui/pages/confirmations/components/confirm/info/hooks/useEIP1559TxFees.ts
index e4bfaad8d779..e9224a9c8875 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useEIP1559TxFees.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useEIP1559TxFees.ts
@@ -8,11 +8,9 @@ export const useEIP1559TxFees = (
   maxFeePerGas: string;
   maxPriorityFeePerGas: string;
 } => {
-  const hexMaxFeePerGas =
-    transactionMeta.dappSuggestedGasFees?.maxFeePerGas ||
-    transactionMeta?.txParams?.maxFeePerGas;
+  const hexMaxFeePerGas = transactionMeta?.txParams?.maxFeePerGas;
+
   const hexMaxPriorityFeePerGas =
-    transactionMeta.dappSuggestedGasFees?.maxPriorityFeePerGas ||
     transactionMeta?.txParams?.maxPriorityFeePerGas;
 
   return useMemo(() => {
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
index 5b54dcc710b8..3039a33e6d4f 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
@@ -99,10 +99,7 @@ export function useFeeCalculations(transactionMeta: TransactionMeta) {
   );
 
   // Max fee
-  const gasLimit =
-    transactionMeta?.dappSuggestedGasFees?.gas ||
-    transactionMeta?.txParams?.gas ||
-    HEX_ZERO;
+  const gasLimit = transactionMeta?.txParams?.gas || HEX_ZERO;
   const gasPrice = transactionMeta?.txParams?.gasPrice || HEX_ZERO;
 
   const maxFee = useMemo(() => {
@@ -146,7 +143,13 @@ export function useFeeCalculations(transactionMeta: TransactionMeta) {
     );
 
     return getFeesFromHex(estimatedFee);
-  }, [gasFeeEstimate, transactionMeta, estimatedBaseFee, getFeesFromHex]);
+  }, [
+    gasFeeEstimate,
+    transactionMeta,
+    estimatedBaseFee,
+    maxPriorityFeePerGas,
+    getFeesFromHex,
+  ]);
 
   return {
     estimatedFeeFiat: estimatedFees.currentCurrencyFee,
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useTransactionGasFeeEstimate.ts b/ui/pages/confirmations/components/confirm/info/hooks/useTransactionGasFeeEstimate.ts
index f5866a283935..2a4ddb7d162f 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useTransactionGasFeeEstimate.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useTransactionGasFeeEstimate.ts
@@ -22,17 +22,11 @@ export function useTransactionGasFeeEstimate(
     ?.estimatedBaseFee;
 
   // override with values from `dappSuggestedGasFees` if they exist
-  gasLimit = transactionMeta.dappSuggestedGasFees?.gas || gasLimit || HEX_ZERO;
-  gasPrice =
-    transactionMeta.dappSuggestedGasFees?.gasPrice || gasPrice || HEX_ZERO;
+  gasLimit = gasLimit || HEX_ZERO;
+  gasPrice = gasPrice || HEX_ZERO;
   const maxPriorityFeePerGas =
-    transactionMeta.dappSuggestedGasFees?.maxPriorityFeePerGas ||
-    transactionMeta.txParams?.maxPriorityFeePerGas ||
-    HEX_ZERO;
-  const maxFeePerGas =
-    transactionMeta.dappSuggestedGasFees?.maxFeePerGas ||
-    transactionMeta.txParams?.maxFeePerGas ||
-    HEX_ZERO;
+    transactionMeta.txParams?.maxPriorityFeePerGas || HEX_ZERO;
+  const maxFeePerGas = transactionMeta.txParams?.maxFeePerGas || HEX_ZERO;
 
   let gasEstimate: Hex;
   if (supportsEIP1559) {
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 4181d12bee5c..d0fa6e7f80f1 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
@@ -326,7 +326,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           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
+          $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"
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 77794c9e70a4..4c15591f30f5 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
@@ -327,7 +327,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           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
+          $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"
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 81782a20ec5b..b66065f7c898 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
@@ -206,7 +206,7 @@ exports[`<SetApprovalForAllInfo /> renders component for approve request 1`] = `
           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
+          $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"
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 a76528600fb5..bc3b81bf87b8 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
@@ -355,7 +355,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           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
+          $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"

From 15f71255eeea8db3d78eea7e1bcaa5ff208c7063 Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Wed, 13 Nov 2024 11:15:48 -0500
Subject: [PATCH 085/111] perf: Create custom spans for account overview tabs
 (#28086)
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**

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

### Motivation

- Creating a Sentry custom span that would capture this performance
issue:
  - https://github.com/MetaMask/metamask-extension/issues/27500
- It was determined that the issue is not captured by the existing "UI
Startup" custom span
(https://github.com/MetaMask/MetaMask-planning/issues/3398).

### Approach

I've decided to widen the scope of this ticket so that it covers
performance issues with all accounts in general (not just those created
with the `account-watcher` snap).

To this end, I've defined three new custom spans:

- `'Account Overview - Asset List Tab'`
- `'Account Overview - Nfts Tab'`
- `'Account Overview - Activity Tab'`

#### Behavior

- **Triggers** a) when an account list item is clicked in the account
list menu component, or b) when an account overview tab (e.g. "Tokens",
"NFTs", "Activity") is clicked, or c) (Only for `"Account Overview -
Asset List Tab"`) the "Import" button in the detected token selection
popover is clicked.
- **Terminates** when one of the following happens (race):
  - A different account is clicked in the account list menu.
  - An account overview tab is clicked.
- The newly selected tab component finishes loading -- including its
resources.
- If there is no data to display, the loading spinner/message
disappears, and the appropriate filler content renders.

#### Helpers

- Added selector for the `defaultHomeActiveTabName` property of the
`metamask` slice.
- Added enum `AccountOverviewTabKey` and objects
`ACCOUNT_OVERVIEW_TAB_KEY_TO_METAMETRICS_EVENT_NAME_MAP`,
`ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP`.

### Results

- The custom spans function as expected.
- The spans successfully distinguish periods of inactivity with loading
time.
- The spans continue to capture delays while the UI toggles between
accounts and account overview tabs.
<img width="1677" alt="Screenshot 2024-11-12 at 8 52 58 AM"
src="https://github.com/user-attachments/assets/62eda693-f488-46f5-a808-6f25a1763d52">

- The custom spans capture the performance issues that motivated this
ticket

- https://github.com/MetaMask/metamask-extension/issues/27500 (see 1.46m
long Nfts Tab span and 5.49s Asset List Tab span)
<img width="1214" alt="Screenshot 2024-11-13 at 1 24 17 AM"
src="https://github.com/user-attachments/assets/9c1f0108-f194-4074-bcc4-1a96f94781d5">

- https://github.com/MetaMask/metamask-extension/issues/28130 (see 1.28m
long Nfts Tab span and Error message: "Cannot destructure property
'imageOriginal' ...")
<img width="1214" alt="Screenshot 2024-11-13 at 1 30 00 AM"
src="https://github.com/user-attachments/assets/9baaf40c-d4da-465b-aef5-cbd684d6f450">

## **Related issues**

- Closes https://github.com/MetaMask/MetaMask-planning/issues/3516

## **Manual testing steps**

1. Click one or more of the account overview tabs ("Tokens", "NFTs",
"Activity").
2. Click Account Menu
3. Switch account and repeat.
  - Add accounts as necessary.
- For load testing, add whale account(s) using the experimental "Watch
Account" feature.


## **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.
---
 .../controllers/app-state-controller.test.ts  |  7 +++-
 .../controllers/app-state-controller.ts       |  7 +++-
 shared/constants/app-state.ts                 | 20 ++++++++++
 shared/lib/trace.ts                           |  3 ++
 .../app/assets/nfts/nfts-tab/nfts-tab.js      |  7 ++++
 .../app/assets/token-list/token-list.tsx      |  9 ++++-
 .../detected-token-selection-popover.js       |  7 +++-
 .../transaction-list.component.js             |  7 ++++
 .../account-list-menu/account-list-menu.tsx   | 20 +++++++++-
 .../account-overview-btc.test.tsx             |  2 +-
 .../account-overview-eth.test.tsx             |  2 +-
 .../account-overview-tabs.tsx                 | 40 +++++++++++--------
 .../account-overview-unknown.test.tsx         |  2 +-
 .../multichain/account-overview/common.ts     |  4 +-
 ui/components/ui/tabs/tabs.component.js       |  7 ----
 ui/selectors/selectors.js                     |  4 ++
 16 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 shared/constants/app-state.ts

diff --git a/app/scripts/controllers/app-state-controller.test.ts b/app/scripts/controllers/app-state-controller.test.ts
index 740c4a7d33f8..4bc1cb63e390 100644
--- a/app/scripts/controllers/app-state-controller.test.ts
+++ b/app/scripts/controllers/app-state-controller.test.ts
@@ -5,6 +5,7 @@ import {
   ORIGIN_METAMASK,
   POLLING_TOKEN_ENVIRONMENT_TYPES,
 } from '../../../shared/constants/app';
+import { AccountOverviewTabKey } from '../../../shared/constants/app-state';
 import { AppStateController } from './app-state-controller';
 import type {
   AllowedActions,
@@ -209,9 +210,11 @@ describe('AppStateController', () => {
 
   describe('setDefaultHomeActiveTabName', () => {
     it('sets the default home tab name', () => {
-      appStateController.setDefaultHomeActiveTabName('testTabName');
+      appStateController.setDefaultHomeActiveTabName(
+        AccountOverviewTabKey.Activity,
+      );
       expect(appStateController.store.getState().defaultHomeActiveTabName).toBe(
-        'testTabName',
+        AccountOverviewTabKey.Activity,
       );
     });
   });
diff --git a/app/scripts/controllers/app-state-controller.ts b/app/scripts/controllers/app-state-controller.ts
index e76b8fe3888e..605f307ec0e4 100644
--- a/app/scripts/controllers/app-state-controller.ts
+++ b/app/scripts/controllers/app-state-controller.ts
@@ -26,6 +26,7 @@ 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 type {
   Preferences,
   PreferencesControllerGetStateAction,
@@ -35,7 +36,7 @@ import type {
 export type AppStateControllerState = {
   timeoutMinutes: number;
   connectedStatusPopoverHasBeenShown: boolean;
-  defaultHomeActiveTabName: string | null;
+  defaultHomeActiveTabName: AccountOverviewTabKey | null;
   browserEnvironment: Record<string, string>;
   popupGasPollTokens: string[];
   notificationGasPollTokens: string[];
@@ -326,7 +327,9 @@ export class AppStateController extends EventEmitter {
    *
    * @param defaultHomeActiveTabName - the tab name
    */
-  setDefaultHomeActiveTabName(defaultHomeActiveTabName: string | null): void {
+  setDefaultHomeActiveTabName(
+    defaultHomeActiveTabName: AccountOverviewTabKey | null,
+  ): void {
     this.store.updateState({
       defaultHomeActiveTabName,
     });
diff --git a/shared/constants/app-state.ts b/shared/constants/app-state.ts
new file mode 100644
index 000000000000..82424edfe57f
--- /dev/null
+++ b/shared/constants/app-state.ts
@@ -0,0 +1,20 @@
+import { TraceName } from '../lib/trace';
+import { MetaMetricsEventName } from './metametrics';
+
+export enum AccountOverviewTabKey {
+  Tokens = 'tokens',
+  Nfts = 'nfts',
+  Activity = 'activity',
+}
+
+export const ACCOUNT_OVERVIEW_TAB_KEY_TO_METAMETRICS_EVENT_NAME_MAP = {
+  [AccountOverviewTabKey.Tokens]: MetaMetricsEventName.TokenScreenOpened,
+  [AccountOverviewTabKey.Nfts]: MetaMetricsEventName.NftScreenOpened,
+  [AccountOverviewTabKey.Activity]: MetaMetricsEventName.ActivityScreenOpened,
+} as const;
+
+export const ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP = {
+  [AccountOverviewTabKey.Tokens]: TraceName.AccountOverviewAssetListTab,
+  [AccountOverviewTabKey.Nfts]: TraceName.AccountOverviewNftsTab,
+  [AccountOverviewTabKey.Activity]: TraceName.AccountOverviewActivityTab,
+} as const;
diff --git a/shared/lib/trace.ts b/shared/lib/trace.ts
index 1dd50b736222..0d58ddcdcfcc 100644
--- a/shared/lib/trace.ts
+++ b/shared/lib/trace.ts
@@ -10,6 +10,9 @@ import { log as sentryLogger } from '../../app/scripts/lib/setupSentry';
  */
 export enum TraceName {
   AccountList = 'Account List',
+  AccountOverviewAssetListTab = 'Account Overview Asset List Tab',
+  AccountOverviewNftsTab = 'Account Overview Nfts Tab',
+  AccountOverviewActivityTab = 'Account Overview Activity Tab',
   BackgroundConnect = 'Background Connect',
   DeveloperTest = 'Developer Test',
   FirstRender = 'First Render',
diff --git a/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js
index 9a1062e4f177..2a9f3287346e 100644
--- a/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js
+++ b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js
@@ -39,6 +39,7 @@ import {
 } from '../../../../../../shared/constants/metametrics';
 import { getCurrentLocale } from '../../../../../ducks/locale/locale';
 import Spinner from '../../../../ui/spinner';
+import { endTrace, TraceName } from '../../../../../../shared/lib/trace';
 
 export default function NftsTab() {
   const useNftDetection = useSelector(getUseNftDetection);
@@ -93,6 +94,12 @@ export default function NftsTab() {
     currentLocale,
   ]);
 
+  useEffect(() => {
+    if (!nftsLoading && !nftsStillFetchingIndication) {
+      endTrace({ name: TraceName.AccountOverviewNftsTab });
+    }
+  }, [nftsLoading, nftsStillFetchingIndication]);
+
   if (!hasAnyNfts && nftsStillFetchingIndication) {
     return (
       <Box className="nfts-tab__loading">
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index f0b17d686026..94efb3160b23 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useMemo } from 'react';
+import React, { ReactNode, useEffect, useMemo } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import TokenCell from '../token-cell';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
@@ -19,6 +19,7 @@ import {
 import { useAccountTotalFiatBalance } from '../../../../hooks/useAccountTotalFiatBalance';
 import { getConversionRate } from '../../../../ducks/metamask/metamask';
 import { useNativeTokenBalance } from '../asset-list/native-token/use-native-token-balance';
+import { endTrace, TraceName } from '../../../../../shared/lib/trace';
 
 type TokenListProps = {
   onTokenClick: (arg: string) => void;
@@ -66,6 +67,12 @@ export default function TokenList({
     contractExchangeRates,
   ]);
 
+  useEffect(() => {
+    if (!loading) {
+      endTrace({ name: TraceName.AccountOverviewAssetListTab });
+    }
+  }, [loading]);
+
   return loading ? (
     <Box
       display={Display.Flex}
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 2556cc767623..0229173050d8 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
@@ -18,6 +18,7 @@ import Popover from '../../../ui/popover';
 import Box from '../../../ui/box';
 import Button from '../../../ui/button';
 import DetectedTokenDetails from '../detected-token-details/detected-token-details';
+import { trace, endTrace, TraceName } from '../../../../../shared/lib/trace';
 
 const DetectedTokenSelectionPopover = ({
   tokensListDetected,
@@ -64,7 +65,11 @@ const DetectedTokenSelectionPopover = ({
       <Button
         className="detected-token-selection-popover__import-button"
         type="primary"
-        onClick={onImport}
+        onClick={() => {
+          endTrace({ name: TraceName.AccountOverviewAssetListTab });
+          trace({ name: TraceName.AccountOverviewAssetListTab });
+          onImport();
+        }}
         disabled={selectedTokens.length === 0}
       >
         {t('importWithCount', [`(${selectedTokens.length})`])}
diff --git a/ui/components/app/transaction-list/transaction-list.component.js b/ui/components/app/transaction-list/transaction-list.component.js
index 860571fbe0c5..2fd7d0bc6d1a 100644
--- a/ui/components/app/transaction-list/transaction-list.component.js
+++ b/ui/components/app/transaction-list/transaction-list.component.js
@@ -4,6 +4,7 @@ import React, {
   useCallback,
   Fragment,
   useContext,
+  useEffect,
 } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
@@ -53,6 +54,7 @@ import { getMultichainAccountUrl } from '../../../helpers/utils/multichain/block
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 import { getMultichainNetwork } from '../../../selectors/multichain';
+import { endTrace, TraceName } from '../../../../shared/lib/trace';
 
 const PAGE_INCREMENT = 10;
 
@@ -258,6 +260,11 @@ export default function TransactionList({
   // Check if the current account is a bitcoin account
   const isBitcoinAccount = useSelector(isSelectedInternalAccountBtc);
   const trackEvent = useContext(MetaMetricsContext);
+
+  useEffect(() => {
+    endTrace({ name: TraceName.AccountOverviewActivityTab });
+  }, []);
+
   const multichainNetwork = useMultichainSelector(
     getMultichainNetwork,
     selectedAccount,
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 75d04e9e60e0..d649934ee75d 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -68,6 +68,7 @@ import {
   getOriginOfCurrentTab,
   getSelectedInternalAccount,
   getUpdatedAndSortedAccounts,
+  getDefaultHomeActiveTabName,
   ///: BEGIN:ONLY_INCLUDE_IF(solana)
   getIsSolanaSupportEnabled,
   ///: END:ONLY_INCLUDE_IF
@@ -114,7 +115,11 @@ import {
   AccountConnections,
   MergedInternalAccount,
 } from '../../../selectors/selectors.types';
-import { endTrace, TraceName } from '../../../../shared/lib/trace';
+import { endTrace, trace, TraceName } from '../../../../shared/lib/trace';
+import {
+  ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP,
+  AccountOverviewTabKey,
+} from '../../../../shared/constants/app-state';
 ///: BEGIN:ONLY_INCLUDE_IF(solana)
 import {
   SOLANA_WALLET_NAME,
@@ -251,6 +256,9 @@ export const AccountListMenu = ({
       ),
     [updatedAccountsList, allowedAccountTypes],
   );
+  const defaultHomeActiveTabName: AccountOverviewTabKey = useSelector(
+    getDefaultHomeActiveTabName,
+  );
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   const addSnapAccountEnabled = useSelector(getIsAddSnapAccountEnabled);
   ///: END:ONLY_INCLUDE_IF
@@ -340,6 +348,16 @@ export const AccountListMenu = ({
             location: 'Main Menu',
           },
         });
+        endTrace({
+          name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[
+            defaultHomeActiveTabName
+          ],
+        });
+        trace({
+          name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[
+            defaultHomeActiveTabName
+          ],
+        });
         dispatch(setSelectedAccount(account.address));
       };
     },
diff --git a/ui/components/multichain/account-overview/account-overview-btc.test.tsx b/ui/components/multichain/account-overview/account-overview-btc.test.tsx
index 9d265657432b..1def72354c82 100644
--- a/ui/components/multichain/account-overview/account-overview-btc.test.tsx
+++ b/ui/components/multichain/account-overview/account-overview-btc.test.tsx
@@ -9,7 +9,7 @@ import {
 } from './account-overview-btc';
 
 const defaultProps: AccountOverviewBtcProps = {
-  defaultHomeActiveTabName: '',
+  defaultHomeActiveTabName: null,
   onTabClick: jest.fn(),
   setBasicFunctionalityModalOpen: jest.fn(),
   onSupportLinkClick: jest.fn(),
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 f6f67892942a..ba2049ffd205 100644
--- a/ui/components/multichain/account-overview/account-overview-eth.test.tsx
+++ b/ui/components/multichain/account-overview/account-overview-eth.test.tsx
@@ -22,7 +22,7 @@ describe('AccountOverviewEth', () => {
   });
   it('shows all tabs', () => {
     const { queryByTestId } = render({
-      defaultHomeActiveTabName: '',
+      defaultHomeActiveTabName: null,
       onTabClick: jest.fn(),
       setBasicFunctionalityModalOpen: jest.fn(),
       onSupportLinkClick: jest.fn(),
diff --git a/ui/components/multichain/account-overview/account-overview-tabs.tsx b/ui/components/multichain/account-overview/account-overview-tabs.tsx
index 554d9fb0acfc..e83d349c62ef 100644
--- a/ui/components/multichain/account-overview/account-overview-tabs.tsx
+++ b/ui/components/multichain/account-overview/account-overview-tabs.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useContext, useMemo } from 'react';
+import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
+import { endTrace, trace } from '../../../../shared/lib/trace';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { ASSET_ROUTE } from '../../../helpers/constants/routes';
 import {
@@ -7,10 +9,7 @@ import {
   SUPPORT_LINK,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../../shared/lib/ui-utils';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import NftsTab from '../../app/assets/nfts/nfts-tab';
 import AssetList from '../../app/assets/asset-list';
@@ -37,6 +36,12 @@ import {
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import InstitutionalHomeFooter from '../../../pages/home/institutional/institutional-home-footer';
 ///: END:ONLY_INCLUDE_IF
+import {
+  ACCOUNT_OVERVIEW_TAB_KEY_TO_METAMETRICS_EVENT_NAME_MAP,
+  ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP,
+  AccountOverviewTabKey,
+} from '../../../../shared/constants/app-state';
+import { detectNfts } from '../../../store/actions';
 import { AccountOverviewCommonProps } from './common';
 
 export type AccountOverviewTabsProps = AccountOverviewCommonProps & {
@@ -60,6 +65,7 @@ export const AccountOverviewTabs = ({
   const history = useHistory();
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
+  const dispatch = useDispatch();
 
   const tabProps = useMemo(
     () => ({
@@ -69,24 +75,24 @@ export const AccountOverviewTabs = ({
     [],
   );
 
-  const getEventFromTabName = (tabName: string) => {
-    switch (tabName) {
-      case 'nfts':
-        return MetaMetricsEventName.NftScreenOpened;
-      case 'activity':
-        return MetaMetricsEventName.ActivityScreenOpened;
-      default:
-        return MetaMetricsEventName.TokenScreenOpened;
-    }
-  };
-
   const handleTabClick = useCallback(
-    (tabName: string) => {
+    (tabName: AccountOverviewTabKey) => {
       onTabClick(tabName);
+      if (tabName === AccountOverviewTabKey.Nfts) {
+        dispatch(detectNfts());
+      }
       trackEvent({
         category: MetaMetricsEventCategory.Home,
-        event: getEventFromTabName(tabName),
+        event: ACCOUNT_OVERVIEW_TAB_KEY_TO_METAMETRICS_EVENT_NAME_MAP[tabName],
       });
+      if (defaultHomeActiveTabName) {
+        endTrace({
+          name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[
+            defaultHomeActiveTabName
+          ],
+        });
+      }
+      trace({ name: ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP[tabName] });
     },
     [onTabClick],
   );
diff --git a/ui/components/multichain/account-overview/account-overview-unknown.test.tsx b/ui/components/multichain/account-overview/account-overview-unknown.test.tsx
index 59fe2a0c23bc..0d46ff86275f 100644
--- a/ui/components/multichain/account-overview/account-overview-unknown.test.tsx
+++ b/ui/components/multichain/account-overview/account-overview-unknown.test.tsx
@@ -18,7 +18,7 @@ const render = (props: AccountOverviewUnknownProps) => {
 describe('AccountOverviewUnknown', () => {
   it('shows only the activity tab', () => {
     const { queryByTestId } = render({
-      defaultHomeActiveTabName: '',
+      defaultHomeActiveTabName: null,
       onTabClick: jest.fn(),
       setBasicFunctionalityModalOpen: jest.fn(),
       onSupportLinkClick: jest.fn(),
diff --git a/ui/components/multichain/account-overview/common.ts b/ui/components/multichain/account-overview/common.ts
index 7bee1928706b..05957cb37cf1 100644
--- a/ui/components/multichain/account-overview/common.ts
+++ b/ui/components/multichain/account-overview/common.ts
@@ -1,8 +1,10 @@
+import { AccountOverviewTabKey } from '../../../../shared/constants/app-state';
+
 export type AccountOverviewCommonProps = {
   onTabClick: (tabName: string) => void;
   setBasicFunctionalityModalOpen: () => void;
   ///: BEGIN:ONLY_INCLUDE_IF(build-main)
   onSupportLinkClick: () => void;
   ///: END:ONLY_INCLUDE_IF
-  defaultHomeActiveTabName: string;
+  defaultHomeActiveTabName: AccountOverviewTabKey | null;
 };
diff --git a/ui/components/ui/tabs/tabs.component.js b/ui/components/ui/tabs/tabs.component.js
index 9795f697fce3..e96576711ceb 100644
--- a/ui/components/ui/tabs/tabs.component.js
+++ b/ui/components/ui/tabs/tabs.component.js
@@ -1,14 +1,12 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { useDispatch } from 'react-redux';
 import Box from '../box';
 import {
   BackgroundColor,
   DISPLAY,
   JustifyContent,
 } from '../../../helpers/constants/design-system';
-import { detectNfts } from '../../../store/actions';
 
 const Tabs = ({
   defaultActiveTabKey,
@@ -22,7 +20,6 @@ const Tabs = ({
   const _getValidChildren = () => {
     return React.Children.toArray(children).filter(Boolean);
   };
-  const dispatch = useDispatch();
 
   /**
    * Returns the index of the child with the given key
@@ -44,10 +41,6 @@ const Tabs = ({
       setActiveTabIndex(tabIndex);
       onTabClick?.(tabKey);
     }
-
-    if (tabKey === 'nfts') {
-      dispatch(detectNfts());
-    }
   };
 
   const renderTabs = () => {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index c4f2928d8ef2..7c407eae4dc4 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1299,6 +1299,10 @@ export function getOriginOfCurrentTab(state) {
   return state.activeTab.origin;
 }
 
+export function getDefaultHomeActiveTabName(state) {
+  return state.metamask.defaultHomeActiveTabName;
+}
+
 export function getIpfsGateway(state) {
   return state.metamask.ipfsGateway;
 }

From 8a87315002d2b266e281bf869abb61cad643ba32 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 13 Nov 2024 14:00:13 -0600
Subject: [PATCH 086/111] fix: Update PortfolioView flag (#28446)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Provides a more descriptive feature flag name

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28446?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/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.
---
 builds.yml                                                    | 4 ++--
 .../asset-list-control-bar/asset-list-control-bar.tsx         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builds.yml b/builds.yml
index 2442ad51475a..d60365f8bc5a 100644
--- a/builds.yml
+++ b/builds.yml
@@ -280,8 +280,8 @@ env:
   - BARAD_DUR: ''
   # Determines if feature flagged Chain permissions
   - CHAIN_PERMISSIONS: ''
-  # Determines if feature flagged Filter toggle
-  - FILTER_TOKENS_TOGGLE: ''
+  # Determines if Portfolio View UI should be shown
+  - PORTFOLIO_VIEW: ''
   # Enables use of test gas fee flow to debug gas fee estimation
   - TEST_GAS_FEE_FLOWS: false
   # Temporary mechanism to enable security alerts API prior to release
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 de771976e677..c09421279265 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
@@ -78,7 +78,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
           isFullScreen ? JustifyContent.flexStart : JustifyContent.spaceBetween
         }
       >
-        {process.env.FILTER_TOKENS_TOGGLE && (
+        {process.env.PORTFOLIO_VIEW && (
           <ButtonBase
             data-testid="sort-by-popover-toggle"
             className="asset-list-control-bar__button"

From e9ffd0ac592d99b734bd47da584f27be00a75db7 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 14 Nov 2024 04:34:37 +0530
Subject: [PATCH 087/111] feat: update signature controller and integrate
 decoding api (#28397)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Integrate decoding api.

## **Related issues**

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

## **Manual testing steps**

1. Enable decoding api locally using env variables
2. Submit a permit request
3. Check that decoding api results are present in confirmation object

## **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.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
---
 app/scripts/controllers/mmi-controller.ts |  2 +-
 app/scripts/metamask-controller.js        |  5 +++++
 builds.yml                                |  4 ++++
 lavamoat/browserify/beta/policy.json      |  3 +++
 lavamoat/browserify/flask/policy.json     |  3 +++
 lavamoat/browserify/main/policy.json      |  3 +++
 lavamoat/browserify/mmi/policy.json       |  3 +++
 package.json                              |  2 +-
 yarn.lock                                 | 12 ++++++------
 9 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index 33923f02bde2..9f2701b2c0b9 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -24,9 +24,9 @@ import { NetworkState } from '@metamask/network-controller';
 import {
   MessageParamsPersonal,
   MessageParamsTyped,
+  OriginalRequest,
   SignatureController,
 } from '@metamask/signature-controller';
-import { OriginalRequest } from '@metamask/message-manager';
 import { InternalAccount } from '@metamask/keyring-api';
 import { toHex } from '@metamask/controller-utils';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9632e072c70b..029d2b017e67 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2001,6 +2001,11 @@ export default class MetamaskController extends EventEmitter {
         ],
       }),
       trace,
+      decodingApiUrl: process.env.DECODING_API_URL,
+      isDecodeSignatureRequestEnabled: () =>
+        this.preferencesController.state.useExternalServices === true &&
+        this.preferencesController.state.useTransactionSimulations &&
+        process.env.ENABLE_SIGNATURE_DECODING === true,
     });
 
     this.signatureController.hub.on(
diff --git a/builds.yml b/builds.yml
index d60365f8bc5a..316e8f943eb1 100644
--- a/builds.yml
+++ b/builds.yml
@@ -235,6 +235,10 @@ env:
 
   # Used to enable confirmation redesigned pages
   - ENABLE_CONFIRMATION_REDESIGN: ''
+  # Used to enable signature decoding
+  - ENABLE_SIGNATURE_DECODING: ''
+  # URL of the decoding API used to provide additional data from signature requests
+  - DECODING_API_URL: null
   # 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/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 94bf575e610a..2993482ec504 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2603,6 +2603,9 @@
       }
     },
     "@metamask/signature-controller": {
+      "globals": {
+        "fetch": true
+      },
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 94bf575e610a..2993482ec504 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2603,6 +2603,9 @@
       }
     },
     "@metamask/signature-controller": {
+      "globals": {
+        "fetch": true
+      },
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 94bf575e610a..2993482ec504 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2603,6 +2603,9 @@
       }
     },
     "@metamask/signature-controller": {
+      "globals": {
+        "fetch": true
+      },
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 9acbc67302ab..02d73c44f420 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2695,6 +2695,9 @@
       }
     },
     "@metamask/signature-controller": {
+      "globals": {
+        "fetch": true
+      },
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
diff --git a/package.json b/package.json
index 6c9811cb3ed6..5be5168b34c2 100644
--- a/package.json
+++ b/package.json
@@ -345,7 +345,7 @@
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "^18.0.2",
-    "@metamask/signature-controller": "^21.0.0",
+    "@metamask/signature-controller": "^21.1.0",
     "@metamask/smart-transactions-controller": "^13.0.0",
     "@metamask/snaps-controllers": "^9.12.0",
     "@metamask/snaps-execution-environments": "^6.9.2",
diff --git a/yarn.lock b/yarn.lock
index d40270b12e9c..3eee3119dc71 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6312,12 +6312,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/signature-controller@npm:^21.0.0":
-  version: 21.0.0
-  resolution: "@metamask/signature-controller@npm:21.0.0"
+"@metamask/signature-controller@npm:^21.1.0":
+  version: 21.1.0
+  resolution: "@metamask/signature-controller@npm:21.1.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.1"
+    "@metamask/controller-utils": "npm:^11.4.2"
     "@metamask/eth-sig-util": "npm:^8.0.0"
     "@metamask/utils": "npm:^10.0.0"
     jsonschema: "npm:^1.2.4"
@@ -6328,7 +6328,7 @@ __metadata:
     "@metamask/keyring-controller": ^17.0.0
     "@metamask/logging-controller": ^6.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/4c1b1cbf909004099adb3f0d2b01c8fe640ae9a13a8e53ffbcf05c7a1a23384f6077b96b845c22c4edf3bceaaff2a705769d4623f37affac7e429ab0dae06912
+  checksum: 10/00d28234d6402632ecf000d7c908a134a0f49cbbdb165a7cfe72895bc91248de82947cd9628dbbe953ffb8b6054f84a0dc1ad824a1aff369d8f2189a78fd56a9
   languageName: node
   linkType: hard
 
@@ -26763,7 +26763,7 @@ __metadata:
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "npm:^18.0.2"
-    "@metamask/signature-controller": "npm:^21.0.0"
+    "@metamask/signature-controller": "npm:^21.1.0"
     "@metamask/smart-transactions-controller": "npm:^13.0.0"
     "@metamask/snaps-controllers": "npm:^9.12.0"
     "@metamask/snaps-execution-environments": "npm:^6.9.2"

From 0a5eb58d86b4805215712f365161668d028c4148 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:37:10 -0800
Subject: [PATCH 088/111] chore: Begin introducing patterns for Multichain
 AssetList (#28429)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR introduces some non-breaking patterns from
https://github.com/MetaMask/metamask-extension/pull/28386

The idea is to introduce this as a smaller PR to reduce the diff in
https://github.com/MetaMask/metamask-extension/pull/28386 to make it
easier to review

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

## **Related issues**

Fixes: N/A

## **Manual testing steps**

App should be fully functional with no regressions

## **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: chloeYue <105063779+chloeYue@users.noreply.github.com>
Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
Co-authored-by: Monte Lai <monte.lai@consensys.net>
Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
Co-authored-by: Pedro Figueiredo <pedro.figueiredo@consensys.net>
---
 test/e2e/tests/tokens/add-hide-token.spec.js  |  2 +-
 .../tokens/custom-token-add-approve.spec.js   |  2 +-
 test/e2e/tests/tokens/token-details.spec.ts   |  2 +-
 test/e2e/tests/tokens/token-list.spec.ts      |  2 +-
 test/e2e/tests/tokens/token-sort.spec.ts      |  2 +-
 .../asset-list-control-bar/index.scss         | 31 ++++++++-
 .../app/assets/asset-list/asset-list.tsx      |  6 +-
 .../import-control/import-control.tsx         | 10 +--
 .../asset-list/native-token/native-token.tsx  |  3 +-
 .../assets/asset-list/sort-control/index.scss |  2 +-
 .../app/assets/token-cell/token-cell.test.tsx |  4 ++
 .../app/assets/token-cell/token-cell.tsx      |  7 +-
 .../app/assets/token-list/token-list.tsx      |  5 +-
 .../account-overview-tabs.tsx                 |  4 +-
 .../asset-picker-modal/Asset.tsx              |  4 +-
 .../asset-picker-modal/AssetList.tsx          |  3 +
 .../import-token-link.test.js                 |  2 +-
 .../token-list-item/token-list-item.test.tsx  |  5 ++
 .../token-list-item/token-list-item.tsx       |  4 +-
 ui/pages/asset/components/asset-page.test.tsx |  3 +
 ui/pages/asset/components/asset-page.tsx      |  2 +
 ui/pages/asset/util.test.ts                   | 66 +++++++++++++++++++
 ui/pages/asset/util.ts                        | 30 ++++++++-
 ui/selectors/multichain.ts                    | 12 ++++
 24 files changed, 182 insertions(+), 31 deletions(-)
 create mode 100644 ui/pages/asset/util.test.ts

diff --git a/test/e2e/tests/tokens/add-hide-token.spec.js b/test/e2e/tests/tokens/add-hide-token.spec.js
index 5eb60d3db17b..c773c560949a 100644
--- a/test/e2e/tests/tokens/add-hide-token.spec.js
+++ b/test/e2e/tests/tokens/add-hide-token.spec.js
@@ -120,7 +120,7 @@ describe('Add existing token using search', function () {
       async ({ driver }) => {
         await unlockWallet(driver);
 
-        await driver.clickElement({ text: 'Import', tag: 'button' });
+        await driver.clickElement(`[data-testid="import-token-button"]`);
         await driver.fill('input[placeholder="Search tokens"]', 'BAT');
         await driver.clickElement({
           text: 'BAT',
diff --git a/test/e2e/tests/tokens/custom-token-add-approve.spec.js b/test/e2e/tests/tokens/custom-token-add-approve.spec.js
index 7a59243da403..8fa765a36164 100644
--- a/test/e2e/tests/tokens/custom-token-add-approve.spec.js
+++ b/test/e2e/tests/tokens/custom-token-add-approve.spec.js
@@ -35,7 +35,7 @@ describe('Create token, approve token and approve token without gas', function (
         );
         await clickNestedButton(driver, 'Tokens');
 
-        await driver.clickElement({ text: 'Import', tag: 'button' });
+        await driver.clickElement(`[data-testid="import-token-button"]`);
         await clickNestedButton(driver, 'Custom token');
         await driver.fill(
           '[data-testid="import-tokens-modal-custom-address"]',
diff --git a/test/e2e/tests/tokens/token-details.spec.ts b/test/e2e/tests/tokens/token-details.spec.ts
index 0d577ab20f19..56d9515e727d 100644
--- a/test/e2e/tests/tokens/token-details.spec.ts
+++ b/test/e2e/tests/tokens/token-details.spec.ts
@@ -27,7 +27,7 @@ describe('Token Details', function () {
   };
 
   const importToken = async (driver: Driver) => {
-    await driver.clickElement({ text: 'Import', tag: 'button' });
+    await driver.clickElement(`[data-testid="import-token-button"]`);
     await clickNestedButton(driver, 'Custom token');
     await driver.fill(
       '[data-testid="import-tokens-modal-custom-address"]',
diff --git a/test/e2e/tests/tokens/token-list.spec.ts b/test/e2e/tests/tokens/token-list.spec.ts
index bffef04c40dd..c20a9f13b0e3 100644
--- a/test/e2e/tests/tokens/token-list.spec.ts
+++ b/test/e2e/tests/tokens/token-list.spec.ts
@@ -27,7 +27,7 @@ describe('Token List', function () {
   };
 
   const importToken = async (driver: Driver) => {
-    await driver.clickElement({ text: 'Import', tag: 'button' });
+    await driver.clickElement(`[data-testid="import-token-button"]`);
     await clickNestedButton(driver, 'Custom token');
     await driver.fill(
       '[data-testid="import-tokens-modal-custom-address"]',
diff --git a/test/e2e/tests/tokens/token-sort.spec.ts b/test/e2e/tests/tokens/token-sort.spec.ts
index e0d335ee0fd6..1fc1df7efd2c 100644
--- a/test/e2e/tests/tokens/token-sort.spec.ts
+++ b/test/e2e/tests/tokens/token-sort.spec.ts
@@ -25,7 +25,7 @@ describe('Token List', function () {
   };
 
   const importToken = async (driver: Driver) => {
-    await driver.clickElement({ text: 'Import', tag: 'button' });
+    await driver.clickElement(`[data-testid="import-token-button"]`);
     await clickNestedButton(driver, 'Custom token');
     await driver.fill(
       '[data-testid="import-tokens-modal-custom-address"]',
diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/index.scss b/ui/components/app/assets/asset-list/asset-list-control-bar/index.scss
index b6dfacce0082..da8376679356 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/index.scss
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/index.scss
@@ -1,12 +1,37 @@
 .asset-list-control-bar {
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding-top: 4px;
+  padding-bottom: 4px;
 
   &__button {
-    // using percentage here to allow for full network name to show when full screen, but ellipsize on extension view
     max-width: 35%;
   }
 
+  &__network_control {
+    justify-content: space-between;
+    min-width: 185px;
+    border-radius: 8px;
+    padding: 0 8px !important;
+    gap: 5px;
+    text-transform: lowercase;
+
+    span::first-letter {
+      text-transform: uppercase;
+    }
+  }
+
+  &__buttons {
+    display: flex;
+    justify-content: flex-end;
+
+    & .asset-list-control-bar__button {
+      width: 32px;
+      min-width: 32px;
+      margin: 0;
+      border-radius: 8px;
+      padding: 0;
+    }
+  }
+
   &__button:hover {
     background-color: var(--color-background-hover);
   }
diff --git a/ui/components/app/assets/asset-list/asset-list.tsx b/ui/components/app/assets/asset-list/asset-list.tsx
index 4cbe529e3df2..1d265ffd4a4a 100644
--- a/ui/components/app/assets/asset-list/asset-list.tsx
+++ b/ui/components/app/assets/asset-list/asset-list.tsx
@@ -51,7 +51,7 @@ export type TokenWithBalance = {
 };
 
 export type AssetListProps = {
-  onClickAsset: (arg: string) => void;
+  onClickAsset: (chainId: string, address: string) => void;
   showTokensLinks?: boolean;
 };
 
@@ -116,8 +116,8 @@ const AssetList = ({ onClickAsset, showTokensLinks }: AssetListProps) => {
       <AssetListControlBar showTokensLinks={showTokensLinks} />
       <TokenList
         nativeToken={<NativeToken onClickAsset={onClickAsset} />}
-        onTokenClick={(tokenAddress: string) => {
-          onClickAsset(tokenAddress);
+        onTokenClick={(chainId: string, tokenAddress: string) => {
+          onClickAsset(chainId, tokenAddress);
           trackEvent({
             event: MetaMetricsEventName.TokenScreenOpened,
             category: MetaMetricsEventCategory.Navigation,
diff --git a/ui/components/app/assets/asset-list/import-control/import-control.tsx b/ui/components/app/assets/asset-list/import-control/import-control.tsx
index 37af8714e2c7..ca5e3a09051a 100644
--- a/ui/components/app/assets/asset-list/import-control/import-control.tsx
+++ b/ui/components/app/assets/asset-list/import-control/import-control.tsx
@@ -7,8 +7,6 @@ import {
 } from '../../../../component-library';
 import {
   BackgroundColor,
-  BorderColor,
-  BorderStyle,
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 import { showImportTokensModal } from '../../../../../store/actions';
@@ -18,7 +16,6 @@ import {
   MetaMetricsEventName,
 } from '../../../../../../shared/constants/metametrics';
 import { getMultichainIsEvm } from '../../../../../selectors/multichain';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
 
 type AssetListControlBarProps = {
   showTokensLinks?: boolean;
@@ -27,7 +24,6 @@ type AssetListControlBarProps = {
 const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
-  const t = useI18nContext();
   const isEvm = useSelector(getMultichainIsEvm);
   // NOTE: Since we can parametrize it now, we keep the original behavior
   // for EVM assets
@@ -41,8 +37,6 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
       size={ButtonBaseSize.Sm}
       startIconName={IconName.Add}
       backgroundColor={BackgroundColor.backgroundDefault}
-      borderColor={BorderColor.borderMuted}
-      borderStyle={BorderStyle.solid}
       color={TextColor.textDefault}
       onClick={() => {
         dispatch(showImportTokensModal());
@@ -54,9 +48,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
           },
         });
       }}
-    >
-      {t('import')}
-    </ButtonBase>
+    />
   );
 };
 
diff --git a/ui/components/app/assets/asset-list/native-token/native-token.tsx b/ui/components/app/assets/asset-list/native-token/native-token.tsx
index e63a2902a552..b1e86479bb79 100644
--- a/ui/components/app/assets/asset-list/native-token/native-token.tsx
+++ b/ui/components/app/assets/asset-list/native-token/native-token.tsx
@@ -43,7 +43,8 @@ const NativeToken = ({ onClickAsset }: AssetListProps) => {
 
   return (
     <TokenListItem
-      onClick={() => onClickAsset(nativeCurrency)}
+      chainId={chainId}
+      onClick={() => onClickAsset(chainId, nativeCurrency)}
       title={nativeCurrency}
       primary={string}
       tokenSymbol={symbol}
diff --git a/ui/components/app/assets/asset-list/sort-control/index.scss b/ui/components/app/assets/asset-list/sort-control/index.scss
index 76e61c1025ae..74a8e142824d 100644
--- a/ui/components/app/assets/asset-list/sort-control/index.scss
+++ b/ui/components/app/assets/asset-list/sort-control/index.scss
@@ -4,7 +4,7 @@
 
 .selectable-list-item {
   cursor: pointer;
-  padding: 16px;
+  padding: 12px 16px;
 
   &--selected {
     background: var(--color-primary-muted);
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 5cb4b30aea49..1968468dcac4 100644
--- a/ui/components/app/assets/token-cell/token-cell.test.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.test.tsx
@@ -85,6 +85,8 @@ describe('Token Cell', () => {
     string: '5.000',
     currentCurrency: 'usd',
     image: '',
+    chainId: '0x1',
+    tokenFiatAmount: 5,
     onClick: jest.fn(),
   };
 
@@ -94,6 +96,8 @@ describe('Token Cell', () => {
     string: '5000000',
     currentCurrency: 'usd',
     image: '',
+    chainId: '0x1',
+    tokenFiatAmount: 5000000,
     onClick: jest.fn(),
   };
   const useSelectorMock = useSelector;
diff --git a/ui/components/app/assets/token-cell/token-cell.tsx b/ui/components/app/assets/token-cell/token-cell.tsx
index 31bb388aa65b..81c237b441d9 100644
--- a/ui/components/app/assets/token-cell/token-cell.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.tsx
@@ -11,15 +11,17 @@ type TokenCellProps = {
   address: string;
   symbol: string;
   string?: string;
+  chainId: string;
   image: string;
   privacyMode?: boolean;
-  onClick?: (arg: string) => void;
+  onClick?: (chainId: string, address: string) => void;
 };
 
 export default function TokenCell({
   address,
   image,
   symbol,
+  chainId,
   string,
   privacyMode = false,
   onClick,
@@ -44,7 +46,8 @@ export default function TokenCell({
 
   return (
     <TokenListItem
-      onClick={onClick ? () => onClick(address) : undefined}
+      chainId={chainId}
+      onClick={onClick ? () => onClick(chainId, address) : undefined}
       tokenSymbol={symbol}
       tokenImage={tokenImage}
       primary={`${primary || 0}`}
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index 94efb3160b23..638c66610a80 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -11,6 +11,7 @@ import {
 import { TokenWithBalance } from '../asset-list/asset-list';
 import { sortAssets } from '../util/sort';
 import {
+  getCurrentChainId,
   getPreferences,
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
@@ -22,7 +23,7 @@ import { useNativeTokenBalance } from '../asset-list/native-token/use-native-tok
 import { endTrace, TraceName } from '../../../../../shared/lib/trace';
 
 type TokenListProps = {
-  onTokenClick: (arg: string) => void;
+  onTokenClick: (chainId: string, address: string) => void;
   nativeToken: ReactNode;
 };
 
@@ -31,6 +32,7 @@ export default function TokenList({
   nativeToken,
 }: TokenListProps) {
   const t = useI18nContext();
+  const currentChainId = useSelector(getCurrentChainId);
   const { tokenSortConfig, tokenNetworkFilter, privacyMode } =
     useSelector(getPreferences);
   const selectedAccount = useSelector(getSelectedAccount);
@@ -95,6 +97,7 @@ export default function TokenList({
         return (
           <TokenCell
             key={`${tokenData.symbol}-${tokenData.address}`}
+            chainId={currentChainId}
             {...tokenData}
             privacyMode={privacyMode}
             onClick={onTokenClick}
diff --git a/ui/components/multichain/account-overview/account-overview-tabs.tsx b/ui/components/multichain/account-overview/account-overview-tabs.tsx
index e83d349c62ef..8c356f9f9141 100644
--- a/ui/components/multichain/account-overview/account-overview-tabs.tsx
+++ b/ui/components/multichain/account-overview/account-overview-tabs.tsx
@@ -149,7 +149,9 @@ export const AccountOverviewTabs = ({
             <Box marginTop={2}>
               <AssetList
                 showTokensLinks={showTokensLinks ?? true}
-                onClickAsset={(asset: string) =>
+                // TODO: chainID to be incorporated in unified asset list
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                onClickAsset={(chainId: string, asset: string) =>
                   history.push(`${ASSET_ROUTE}/${asset}`)
                 }
               />
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 f384ef8fd96f..47d487f5ffd8 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,7 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { BigNumber } from 'bignumber.js';
-import { getTokenList } from '../../../../selectors';
+import { getTokenList, getCurrentChainId } from '../../../../selectors';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { TokenListItem } from '../../token-list-item';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
@@ -22,6 +22,7 @@ export default function Asset({
 }: AssetProps) {
   const locale = useSelector(getIntlLocale);
 
+  const chainId = useSelector(getCurrentChainId);
   const tokenList = useSelector(getTokenList);
   const tokenData = address
     ? Object.values(tokenList).find(
@@ -49,6 +50,7 @@ export default function Asset({
 
   return (
     <TokenListItem
+      chainId={chainId}
       tokenSymbol={symbol}
       tokenImage={tokenImage}
       secondary={formattedAmount}
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 fa071740b51d..6ec571042899 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
@@ -2,6 +2,7 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import classnames from 'classnames';
 import {
+  getCurrentChainId,
   getCurrentCurrency,
   getSelectedAccountCachedBalance,
 } from '../../../../selectors';
@@ -42,6 +43,7 @@ export default function AssetList({
 }: AssetListProps) {
   const selectedToken = asset?.address;
 
+  const chainId = useSelector(getCurrentChainId);
   const nativeCurrency = useSelector(getNativeCurrency);
   const balanceValue = useSelector(getSelectedAccountCachedBalance);
   const currentCurrency = useSelector(getCurrentCurrency);
@@ -102,6 +104,7 @@ export default function AssetList({
               <Box marginInlineStart={2}>
                 {token.type === AssetType.native ? (
                   <TokenListItem
+                    chainId={chainId}
                     title={token.symbol}
                     primary={primaryCurrencyValue}
                     tokenSymbol={token.symbol}
diff --git a/ui/components/multichain/import-token-link/import-token-link.test.js b/ui/components/multichain/import-token-link/import-token-link.test.js
index 641a39d1bff3..2539f98e6491 100644
--- a/ui/components/multichain/import-token-link/import-token-link.test.js
+++ b/ui/components/multichain/import-token-link/import-token-link.test.js
@@ -88,6 +88,6 @@ describe('Import Token Link', () => {
     const importToken = screen.getByTestId('import-token-button');
     fireEvent.click(importToken);
 
-    expect(screen.getByText('Import')).toBeInTheDocument();
+    expect(screen.getByTestId('import-token-button')).toBeInTheDocument();
   });
 });
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 73c352910b34..7864c221e90e 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
@@ -69,6 +69,7 @@ describe('TokenListItem', () => {
     onClick: jest.fn(),
     tokenImage: '',
     title: '',
+    chainId: '0x1',
   };
   it('should render correctly', () => {
     const store = configureMockStore()(state);
@@ -99,6 +100,7 @@ describe('TokenListItem', () => {
       isOriginalTokenSymbol: false,
       tokenImage: '',
       title: '',
+      chainId: '0x1',
     };
     const { getByText } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
@@ -117,6 +119,7 @@ describe('TokenListItem', () => {
       tokenImage: '',
       title: '',
       tokenSymbol: 'SCAM_TOKEN',
+      chainId: '0x1',
     };
     const { getByTestId, getByText } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
@@ -144,6 +147,7 @@ describe('TokenListItem', () => {
       tokenImage: '',
       title: '',
       tokenSymbol: 'SCAM_TOKEN',
+      chainId: '0x1',
     };
     const { getByTestId, getByText } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
@@ -171,6 +175,7 @@ describe('TokenListItem', () => {
       isOriginalTokenSymbol: false,
       tokenImage: '',
       title: '',
+      chainId: '0x1',
     };
 
     const { getByText } = renderWithProvider(
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 265b334fdb57..1f9f0b18bed5 100644
--- a/ui/components/multichain/token-list-item/token-list-item.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.tsx
@@ -46,7 +46,6 @@ import {
   getDataCollectionForMarketing,
 } from '../../../selectors';
 import {
-  getMultichainCurrentChainId,
   getMultichainCurrentNetwork,
   getMultichainIsEvm,
 } from '../../../selectors/multichain';
@@ -78,6 +77,7 @@ type TokenListItemProps = {
   secondary?: string | null;
   title: string;
   tooltipText?: string;
+  chainId: string;
   isOriginalTokenSymbol?: boolean | null;
   isNativeCurrency?: boolean;
   isStakeable?: boolean;
@@ -96,6 +96,7 @@ export const TokenListItem = ({
   secondary,
   title,
   tooltipText,
+  chainId,
   isOriginalTokenSymbol,
   isPrimaryTokenSymbolHidden = false,
   isNativeCurrency = false,
@@ -107,7 +108,6 @@ export const TokenListItem = ({
   const t = useI18nContext();
   const isEvm = useSelector(getMultichainIsEvm);
   const trackEvent = useContext(MetaMetricsContext);
-  const chainId = useSelector(getMultichainCurrentChainId);
   const metaMetricsId = useSelector(getMetaMetricsId);
   const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
   const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
diff --git a/ui/pages/asset/components/asset-page.test.tsx b/ui/pages/asset/components/asset-page.test.tsx
index 35721a30a1c2..6bf1d12feb9e 100644
--- a/ui/pages/asset/components/asset-page.test.tsx
+++ b/ui/pages/asset/components/asset-page.test.tsx
@@ -135,7 +135,9 @@ describe('AssetPage', () => {
     balance: {
       value: '0',
       display: '0',
+      fiat: '',
     },
+    decimals: 18,
   } as const;
 
   const token = {
@@ -148,6 +150,7 @@ describe('AssetPage', () => {
     balance: {
       value: '0',
       display: '0',
+      fiat: '',
     },
   } as const;
 
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 0d73188d145e..29078e3a248c 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -190,6 +190,7 @@ const AssetPage = ({
         </Text>
         {type === AssetType.native ? (
           <TokenListItem
+            chainId={asset.chainId}
             title={symbol}
             tokenSymbol={symbol}
             primary={`${balance.display} ${symbol}`}
@@ -200,6 +201,7 @@ const AssetPage = ({
           />
         ) : (
           <TokenCell
+            chainId={asset.chainId}
             address={address}
             image={image}
             symbol={symbol}
diff --git a/ui/pages/asset/util.test.ts b/ui/pages/asset/util.test.ts
new file mode 100644
index 000000000000..ecf4f2de5381
--- /dev/null
+++ b/ui/pages/asset/util.test.ts
@@ -0,0 +1,66 @@
+import { Token } from '@metamask/assets-controllers';
+import { findAssetByAddress } from './util';
+
+describe('findAssetByAddress', () => {
+  const mockTokens: Record<string, Token[]> = {
+    '0x1': [
+      { address: '0xabc', decimals: 18, symbol: 'ABC', name: 'Token ABC' },
+      { address: '0xdef', decimals: 18, symbol: 'DEF', name: 'Token DEF' },
+    ],
+    '0x2': [
+      { address: '0x123', decimals: 18, symbol: 'XYZ', name: 'Token XYZ' },
+      { address: '0x456', decimals: 18, symbol: 'LMN', name: 'Token LMN' },
+    ],
+  };
+
+  it('should return null and log error when chainId is not provided', () => {
+    console.error = jest.fn();
+    expect(findAssetByAddress(mockTokens, '0xabc')).toBeNull();
+    expect(console.error).toHaveBeenCalledWith('Chain ID is required.');
+  });
+
+  it('should return null and log warning when no tokens are found for chainId', () => {
+    console.warn = jest.fn();
+    expect(findAssetByAddress(mockTokens, '0x123', '0x99')).toBeNull();
+    expect(console.warn).toHaveBeenCalledWith(
+      'No tokens found for chainId: 0x99',
+    );
+  });
+
+  it('should return undefined if address is not provided and no token without address is found', () => {
+    expect(findAssetByAddress(mockTokens, undefined, '0x1')).toBeNull();
+  });
+
+  it('should return the token without address if address is not provided and a token without address exists', () => {
+    const tokensWithNullAddress: Record<string, Token[]> = {
+      '0x1': [
+        { address: '', decimals: 18, symbol: 'NULL', name: 'Token NULL' },
+      ],
+    };
+    expect(
+      findAssetByAddress(tokensWithNullAddress, undefined, '0x1'),
+    ).toBeNull();
+  });
+
+  it('should return the correct token when address and chainId are provided', () => {
+    expect(findAssetByAddress(mockTokens, '0xabc', '0x1')).toEqual({
+      address: '0xabc',
+      decimals: 18,
+      symbol: 'ABC',
+      name: 'Token ABC',
+    });
+  });
+
+  it('should return undefined if no token matches the provided address on the chainId', () => {
+    expect(findAssetByAddress(mockTokens, '0x999', '0x1')).toBeUndefined();
+  });
+
+  it('should be case insensitive when matching addresses', () => {
+    expect(findAssetByAddress(mockTokens, '0xABC', '0x1')).toEqual({
+      address: '0xabc',
+      decimals: 18,
+      symbol: 'ABC',
+      name: 'Token ABC',
+    });
+  });
+});
diff --git a/ui/pages/asset/util.ts b/ui/pages/asset/util.ts
index 824040fa6560..479c69015f35 100644
--- a/ui/pages/asset/util.ts
+++ b/ui/pages/asset/util.ts
@@ -1,4 +1,4 @@
-import { SUPPORTED_CHAIN_IDS } from '@metamask/assets-controllers';
+import { SUPPORTED_CHAIN_IDS, Token } from '@metamask/assets-controllers';
 
 /** Formats a datetime in a short human readable format like 'Feb 8, 12:11 PM' */
 export const getShortDateFormatter = () =>
@@ -64,3 +64,31 @@ export const chainSupportsPricing = (chainId: `0x${string}`) =>
 
 /** The opacity components should set during transition */
 export const loadingOpacity = 0.2;
+
+export const findAssetByAddress = (
+  data: Record<string, Token[]>,
+  address?: string,
+  chainId?: string,
+): Token | undefined | null => {
+  if (!chainId) {
+    console.error('Chain ID is required.');
+    return null;
+  }
+
+  const tokens = data[chainId];
+
+  if (!tokens) {
+    console.warn(`No tokens found for chainId: ${chainId}`);
+    return null;
+  }
+
+  if (!address) {
+    console.warn(`No token found for address: ${address}`);
+    return null;
+  }
+
+  return tokens.find(
+    (token) =>
+      token.address && token.address.toLowerCase() === address.toLowerCase(),
+  );
+};
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index 96266687b6df..08078be52f03 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -23,6 +23,7 @@ import { MultichainNativeAssets } from '../../shared/constants/multichain/assets
 import {
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
   TEST_NETWORK_IDS,
+  CHAIN_IDS,
 } from '../../shared/constants/network';
 import { AccountsState, getSelectedInternalAccount } from './accounts';
 import {
@@ -316,6 +317,10 @@ export function getMultichainCurrentChainId(state: MultichainState) {
   return chainId;
 }
 
+export function isChainIdMainnet(chainId: string) {
+  return chainId === CHAIN_IDS.MAINNET;
+}
+
 export function getMultichainIsMainnet(
   state: MultichainState,
   account?: InternalAccount,
@@ -369,6 +374,13 @@ function getBtcCachedBalance(state: MultichainState) {
   return balances?.[account.id]?.[asset]?.amount;
 }
 
+export function getImageForChainId(chainId: string) {
+  const evmChainIdKey =
+    chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP;
+
+  return CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[evmChainIdKey];
+}
+
 // This selector is not compatible with `useMultichainSelector` since it uses the selected
 // account implicitly!
 export function getMultichainSelectedAccountCachedBalance(

From c5c59df03209a5b6e00c95d43ec5f0b49b7658c8 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 14 Nov 2024 08:39:25 +0000
Subject: [PATCH 089/111] fix: Hide "interacting with" when simulated balance
 changes are shown (#28409)
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 "Interacting with" section is shown only if the simulated changes
are empty, if there was a simulation error or if the advanced details
view is toggled on.

<!--
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/28409?quickstart=1)

## **Related issues**

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

## **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.
---
 .../token-transfer/token-details-section.tsx  | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

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 c4a563fbc4dd..b2ee988adde9 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
@@ -28,6 +28,8 @@ import {
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { getNetworkConfigurationsByChainId } from '../../../../../../selectors';
 import { useConfirmContext } from '../../../../context/confirm';
+import { selectConfirmationAdvancedDetailsOpen } from '../../../../selectors/preferences';
+import { useBalanceChanges } from '../../../simulation-details/useBalanceChanges';
 
 export const TokenDetailsSection = () => {
   const t = useI18nContext();
@@ -38,6 +40,20 @@ export const TokenDetailsSection = () => {
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
   const networkName = networkConfigurations[chainId].name;
 
+  const showAdvancedDetails = useSelector(
+    selectConfirmationAdvancedDetailsOpen,
+  );
+
+  const isSimulationError = Boolean(
+    transactionMeta.simulationData?.error?.code,
+  );
+  const balanceChangesResult = useBalanceChanges({
+    chainId,
+    simulationData: transactionMeta.simulationData,
+  });
+  const balanceChanges = balanceChangesResult.value;
+  const isSimulationEmpty = balanceChanges.length === 0;
+
   const networkRow = (
     <ConfirmInfoRow label={t('transactionFlowNetwork')}>
       <Box
@@ -64,17 +80,18 @@ export const TokenDetailsSection = () => {
     </ConfirmInfoRow>
   );
 
-  const tokenRow = transactionMeta.type !== TransactionType.simpleSend && (
-    <ConfirmInfoRow
-      label={t('interactingWith')}
-      tooltip={t('interactingWithTransactionDescription')}
-    >
-      <ConfirmInfoRowAddress
-        address={transactionMeta.txParams.to as string}
-        chainId={chainId}
-      />
-    </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>
+    );
 
   return (
     <ConfirmInfoSection data-testid="confirmation__transaction-flow">

From b7c3f8384f064ad84dc22a38fc33fc86456d6b48 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 14 Nov 2024 09:03:46 +0000
Subject: [PATCH 090/111] fix: Remove multiple overlapping spinners (#28301)
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 were previously using a UI blocking, whole page spinner while loading
the redesigned confirmations. This overlapped with the individual
component spinners we use on some components that decode transaction
data. That second pattern is preferable because the spinner is contained
and doesn't block the user from taking action.

The global spinner comes from `routes.component`. The first part of this
fix is to bypass it in that file for redesigned confirmations.

The second aspect of this fix is to not condense two component spinners
into one. Since the transaction flow section always loads before the
send heading component, we can omit the spinner for that first
component.

Finally, this PR fixes the loading behaviour on the send heading
component so that if the decimals amount coming from `useAssetDetails`
hasn't been received yet, the heading is not shown, preventing
undesireable flickering in the hero value.



<!--
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/28301?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Go to test dapp
2. Click on malicious erc20 transfer to see the 2 spinners on top and
the different one in the middle
3. Click on malicious erc20 approve to see the different spinner in the
middle

## **Screenshots/Recordings**

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

### **Before**

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

<img width="362" alt="Screenshot 2024-10-18 at 18 11 08"
src="https://github.com/user-attachments/assets/9fbc5c1e-229c-4dfa-8231-4957a1ecf713">

### **After**

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


https://github.com/user-attachments/assets/2f5dd8c2-3b9b-405d-b9b5-0eb8bf793fcb


## **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.
---
 .../hooks/use-approve-token-simulation.ts     | 22 +++---
 .../info/hooks/use-token-values.test.ts       | 20 +-----
 .../confirm/info/hooks/use-token-values.ts    | 69 +++++++++++--------
 .../native-transfer.test.tsx.snap             | 43 ------------
 .../nft-token-transfer.test.tsx.snap          | 43 ------------
 .../confirm-loader.test.tsx.snap              |  2 +-
 .../shared/confirm-loader/confirm-loader.tsx  |  2 +
 .../native-send-heading.tsx                   | 36 ++++------
 .../__snapshots__/send-heading.test.tsx.snap  |  2 +-
 .../info/shared/send-heading/send-heading.tsx | 21 +++---
 .../token-transfer.test.tsx.snap              | 45 +-----------
 .../transaction-flow-section.tsx              |  3 +-
 ui/pages/routes/routes.component.js           | 39 ++++++++++-
 ui/pages/routes/routes.container.js           | 10 +++
 14 files changed, 128 insertions(+), 229 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.ts b/ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.ts
index ce264285bc13..8a95fdc3e35b 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.ts
+++ b/ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.ts
@@ -1,12 +1,11 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { isHexString } from '@metamask/utils';
-import { BigNumber } from 'bignumber.js';
 import { isBoolean } from 'lodash';
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import { calcTokenAmount } from '../../../../../../../../shared/lib/transactions-controller-utils';
 import { getIntlLocale } from '../../../../../../../ducks/locale/locale';
 import { SPENDING_CAP_UNLIMITED_MSG } from '../../../../../constants';
-import { toNonScientificString } from '../../hooks/use-token-values';
 import { useDecodedTransactionData } from '../../hooks/useDecodedTransactionData';
 import { useIsNFT } from './use-is-nft';
 
@@ -27,7 +26,7 @@ export const useApproveTokenSimulation = (
 
   const decodedSpendingCap = useMemo(() => {
     if (!value) {
-      return 0;
+      return '0';
     }
 
     const paramIndex = value.data[0].params.findIndex(
@@ -38,23 +37,24 @@ export const useApproveTokenSimulation = (
         !isBoolean(param.value),
     );
     if (paramIndex === -1) {
-      return 0;
+      return '0';
     }
 
-    return new BigNumber(value.data[0].params[paramIndex].value.toString())
-      .dividedBy(new BigNumber(10).pow(Number(decimals)))
-      .toNumber();
+    return calcTokenAmount(
+      value.data[0].params[paramIndex].value,
+      Number(decimals),
+    ).toFixed();
   }, [value, decimals]);
 
   const formattedSpendingCap = useMemo(() => {
     // formatting coerces small numbers to 0
-    return isNFT || decodedSpendingCap < 1
-      ? toNonScientificString(decodedSpendingCap)
-      : new Intl.NumberFormat(locale).format(decodedSpendingCap);
+    return isNFT || parseInt(decodedSpendingCap, 10) < 1
+      ? decodedSpendingCap
+      : new Intl.NumberFormat(locale).format(parseInt(decodedSpendingCap, 10));
   }, [decodedSpendingCap, isNFT, locale]);
 
   const spendingCap = useMemo(() => {
-    if (!isNFT && isSpendingCapUnlimited(decodedSpendingCap)) {
+    if (!isNFT && isSpendingCapUnlimited(parseInt(decodedSpendingCap, 10))) {
       return SPENDING_CAP_UNLIMITED_MSG;
     }
     const tokenPrefix = isNFT ? '#' : '';
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 1ca46bb20db6..4489690654d5 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
@@ -5,7 +5,7 @@ import mockState from '../../../../../../../test/data/mock-state.json';
 import { renderHookWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
 import useTokenExchangeRate from '../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { useAssetDetails } from '../../../../hooks/useAssetDetails';
-import { toNonScientificString, useTokenValues } from './use-token-values';
+import { useTokenValues } from './use-token-values';
 import { useDecodedTransactionData } from './useDecodedTransactionData';
 
 jest.mock('../../../../hooks/useAssetDetails', () => ({
@@ -126,21 +126,3 @@ describe('useTokenValues', () => {
     });
   });
 });
-
-describe('toNonScientificString', () => {
-  const TEST_CASES = [
-    { scientific: 1.23e-5, expanded: '0.0000123' },
-    { scientific: 1e-10, expanded: '0.0000000001' },
-    { scientific: 1.23e-21, expanded: '1.23e-21' },
-  ];
-
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each(TEST_CASES)(
-    'Expand $scientific to "$expanded"',
-    ({ scientific, expanded }: { scientific: number; expanded: string }) => {
-      const actual = toNonScientificString(scientific);
-
-      expect(actual).toEqual(expanded);
-    },
-  );
-});
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 087a17c473c6..a8dc62e5719c 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
@@ -4,6 +4,7 @@ import { BigNumber } from 'bignumber.js';
 import { isBoolean } from 'lodash';
 import { useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
+import { calcTokenAmount } from '../../../../../../../shared/lib/transactions-controller-utils';
 import { Numeric } from '../../../../../../../shared/modules/Numeric';
 import useTokenExchangeRate from '../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { getIntlLocale } from '../../../../../../ducks/locale/locale';
@@ -23,26 +24,45 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
   const decodedResponse = useDecodedTransactionData();
   const { value, pending } = decodedResponse;
 
-  const decodedTransferValue = useMemo(() => {
-    if (!value || !decimals) {
-      return 0;
-    }
+  const { decodedTransferValue, isDecodedTransferValuePending } =
+    useMemo(() => {
+      if (!value) {
+        return {
+          decodedTransferValue: '0',
+          isDecodedTransferValuePending: false,
+        };
+      }
 
-    const paramIndex = value.data[0].params.findIndex(
-      (param) =>
-        param.value !== undefined &&
-        !isHexString(param.value) &&
-        param.value.length === undefined &&
-        !isBoolean(param.value),
-    );
-    if (paramIndex === -1) {
-      return 0;
-    }
+      if (!decimals) {
+        return {
+          decodedTransferValue: '0',
+          isDecodedTransferValuePending: true,
+        };
+      }
 
-    return new BigNumber(value.data[0].params[paramIndex].value.toString())
-      .dividedBy(new BigNumber(10).pow(Number(decimals)))
-      .toNumber();
-  }, [value, decimals]);
+      const paramIndex = value.data[0].params.findIndex(
+        (param) =>
+          param.value !== undefined &&
+          !isHexString(param.value) &&
+          param.value.length === undefined &&
+          !isBoolean(param.value),
+      );
+      if (paramIndex === -1) {
+        return {
+          decodedTransferValue: '0',
+          isDecodedTransferValuePending: false,
+        };
+      }
+
+      return {
+        decodedTransferValue: calcTokenAmount(
+          value.data[0].params[paramIndex].value,
+          decimals,
+        ).toFixed(),
+        isDecodedTransferValuePending: false,
+      };
+      // };
+    }, [value, decimals]);
 
   const [exchangeRate, setExchangeRate] = useState<Numeric | undefined>();
   const fetchExchangeRate = async () => {
@@ -67,18 +87,9 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
   );
 
   return {
-    decodedTransferValue: toNonScientificString(decodedTransferValue),
+    decodedTransferValue,
     displayTransferValue,
     fiatDisplayValue,
-    pending,
+    pending: pending || isDecodedTransferValuePending,
   };
 };
-
-export function toNonScientificString(num: number): string {
-  if (num >= 10e-18) {
-    return num.toFixed(18).replace(/\.?0+$/u, '');
-  }
-
-  // keep in scientific notation
-  return num.toString();
-}
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 d0fa6e7f80f1..a17a5f37578a 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
@@ -16,49 +16,6 @@ exports[`NativeTransferInfo renders correctly 1`] = `
       0 ETH
     </h2>
   </div>
-  <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
-  >
-    <svg
-      class="preloader__icon"
-      fill="none"
-      height="20"
-      viewBox="0 0 16 16"
-      width="20"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        clip-rule="evenodd"
-        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-        fill="var(--color-primary-muted)"
-        fill-rule="evenodd"
-      />
-      <mask
-        height="16"
-        id="mask0"
-        mask-type="alpha"
-        maskUnits="userSpaceOnUse"
-        width="16"
-        x="0"
-        y="0"
-      >
-        <path
-          clip-rule="evenodd"
-          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-          fill="var(--color-primary-default)"
-          fill-rule="evenodd"
-        />
-      </mask>
-      <g
-        mask="url(#mask0)"
-      >
-        <path
-          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
-          fill="var(--color-primary-default)"
-        />
-      </g>
-    </svg>
-  </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
   >
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 4c15591f30f5..ca9af0539f6e 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
@@ -17,49 +17,6 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
       class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
     />
   </div>
-  <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
-  >
-    <svg
-      class="preloader__icon"
-      fill="none"
-      height="20"
-      viewBox="0 0 16 16"
-      width="20"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        clip-rule="evenodd"
-        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-        fill="var(--color-primary-muted)"
-        fill-rule="evenodd"
-      />
-      <mask
-        height="16"
-        id="mask0"
-        mask-type="alpha"
-        maskUnits="userSpaceOnUse"
-        width="16"
-        x="0"
-        y="0"
-      >
-        <path
-          clip-rule="evenodd"
-          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-          fill="var(--color-primary-default)"
-          fill-rule="evenodd"
-        />
-      </mask>
-      <g
-        mask="url(#mask0)"
-      >
-        <path
-          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
-          fill="var(--color-primary-default)"
-        />
-      </g>
-    </svg>
-  </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-0 mm-box--background-color-background-default mm-box--rounded-md"
   >
diff --git a/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/__snapshots__/confirm-loader.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/__snapshots__/confirm-loader.test.tsx.snap
index 9ca7ce75defa..e8a34eeb7679 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/__snapshots__/confirm-loader.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/__snapshots__/confirm-loader.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`<ConfirmLoader /> renders component 1`] = `
 <div>
   <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
+    class="mm-box mm-box--padding-top-4 mm-box--padding-bottom-4 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
     <svg
       class="preloader__icon"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/confirm-loader.tsx b/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/confirm-loader.tsx
index 2aa57f489dfe..e5e5da449666 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/confirm-loader.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/confirm-loader/confirm-loader.tsx
@@ -13,6 +13,8 @@ export const ConfirmLoader = () => {
       display={Display.Flex}
       justifyContent={JustifyContent.center}
       alignItems={AlignItems.center}
+      paddingTop={4}
+      paddingBottom={4}
     >
       <Preloader size={20} />
     </Box>
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 9eb70a856464..486ba863f92d 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
@@ -6,6 +6,7 @@ import {
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
   TEST_CHAINS,
 } from '../../../../../../../../shared/constants/network';
+import { calcTokenAmount } from '../../../../../../../../shared/lib/transactions-controller-utils';
 import {
   AvatarToken,
   AvatarTokenSize,
@@ -22,7 +23,6 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../../../../helpers/constants/design-system';
-import { MIN_AMOUNT } from '../../../../../../../hooks/useCurrencyDisplay';
 import { useFiatFormatter } from '../../../../../../../hooks/useFiatFormatter';
 import {
   getPreferences,
@@ -30,11 +30,7 @@ import {
 } from '../../../../../../../selectors';
 import { getMultichainNetwork } from '../../../../../../../selectors/multichain';
 import { useConfirmContext } from '../../../../../context/confirm';
-import {
-  formatAmount,
-  formatAmountMaxPrecision,
-} from '../../../../simulation-details/formatAmount';
-import { toNonScientificString } from '../../hooks/use-token-values';
+import { formatAmount } from '../../../../simulation-details/formatAmount';
 
 const NativeSendHeading = () => {
   const { currentConfirmation: transactionMeta } =
@@ -42,9 +38,10 @@ const NativeSendHeading = () => {
 
   const { chainId } = transactionMeta;
 
-  const nativeAssetTransferValue = new BigNumber(
+  const nativeAssetTransferValue = calcTokenAmount(
     transactionMeta.txParams.value as string,
-  ).dividedBy(new BigNumber(10).pow(18));
+    18,
+  );
 
   const conversionRate = useSelector((state) =>
     selectConversionRateByChainId(state, chainId),
@@ -66,9 +63,7 @@ const NativeSendHeading = () => {
   const locale = useSelector(getIntlLocale);
   const roundedTransferValue = formatAmount(locale, nativeAssetTransferValue);
 
-  const transferValue = toNonScientificString(
-    nativeAssetTransferValue.toNumber(),
-  );
+  const transferValue = nativeAssetTransferValue.toFixed();
 
   type TestNetChainId = (typeof TEST_CHAINS)[number];
   const isTestnet = TEST_CHAINS.includes(
@@ -90,8 +85,15 @@ const NativeSendHeading = () => {
   );
 
   const NativeAssetAmount =
-    roundedTransferValue ===
-    `<${formatAmountMaxPrecision(locale, MIN_AMOUNT)}` ? (
+    roundedTransferValue === transferValue ? (
+      <Text
+        variant={TextVariant.headingLg}
+        color={TextColor.inherit}
+        marginTop={3}
+      >
+        {`${roundedTransferValue} ${ticker}`}
+      </Text>
+    ) : (
       <Tooltip title={transferValue} position="right">
         <Text
           variant={TextVariant.headingLg}
@@ -101,14 +103,6 @@ const NativeSendHeading = () => {
           {`${roundedTransferValue} ${ticker}`}
         </Text>
       </Tooltip>
-    ) : (
-      <Text
-        variant={TextVariant.headingLg}
-        color={TextColor.inherit}
-        marginTop={3}
-      >
-        {`${roundedTransferValue} ${ticker}`}
-      </Text>
     );
 
   const NativeAssetFiatConversion = Boolean(fiatDisplayValue) &&
diff --git a/ui/pages/confirmations/components/confirm/info/shared/send-heading/__snapshots__/send-heading.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/send-heading/__snapshots__/send-heading.test.tsx.snap
index 677a5a357155..fdc069a399dc 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/send-heading/__snapshots__/send-heading.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/send-heading/__snapshots__/send-heading.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`<SendHeading /> renders component 1`] = `
 <div>
   <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
+    class="mm-box mm-box--padding-top-4 mm-box--padding-bottom-4 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
     <svg
       class="preloader__icon"
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 b44f5be93a4f..3f87b26a3b4a 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
@@ -9,7 +9,6 @@ import {
   Text,
 } from '../../../../../../../components/component-library';
 import Tooltip from '../../../../../../../components/ui/tooltip';
-import { getIntlLocale } from '../../../../../../../ducks/locale/locale';
 import {
   AlignItems,
   BackgroundColor,
@@ -19,11 +18,9 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../../../../helpers/constants/design-system';
-import { MIN_AMOUNT } from '../../../../../../../hooks/useCurrencyDisplay';
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
 import { getPreferences } from '../../../../../../../selectors';
 import { useConfirmContext } from '../../../../../context/confirm';
-import { formatAmountMaxPrecision } from '../../../../simulation-details/formatAmount';
 import { useTokenValues } from '../../hooks/use-token-values';
 import { useTokenDetails } from '../../hooks/useTokenDetails';
 import { ConfirmLoader } from '../confirm-loader/confirm-loader';
@@ -32,7 +29,6 @@ const SendHeading = () => {
   const t = useI18nContext();
   const { currentConfirmation: transactionMeta } =
     useConfirmContext<TransactionMeta>();
-  const locale = useSelector(getIntlLocale);
   const { tokenImage, tokenSymbol } = useTokenDetails(transactionMeta);
   const {
     decodedTransferValue,
@@ -66,21 +62,20 @@ const SendHeading = () => {
   );
 
   const TokenValue =
-    displayTransferValue ===
-    `<${formatAmountMaxPrecision(locale, MIN_AMOUNT)}` ? (
-      <Tooltip title={decodedTransferValue.toString()} position="right">
+    displayTransferValue === decodedTransferValue ? (
+      <Text
+        variant={TextVariant.headingLg}
+        color={TextColor.inherit}
+        marginTop={3}
+      >{`${displayTransferValue} ${tokenSymbol}`}</Text>
+    ) : (
+      <Tooltip title={decodedTransferValue} position="right">
         <Text
           variant={TextVariant.headingLg}
           color={TextColor.inherit}
           marginTop={3}
         >{`${displayTransferValue} ${tokenSymbol}`}</Text>
       </Tooltip>
-    ) : (
-      <Text
-        variant={TextVariant.headingLg}
-        color={TextColor.inherit}
-        marginTop={3}
-      >{`${displayTransferValue} ${tokenSymbol}`}</Text>
     );
 
   const TokenFiatValue = Boolean(fiatDisplayValue) &&
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 bc3b81bf87b8..a59301e50d65 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
@@ -3,50 +3,7 @@
 exports[`TokenTransferInfo renders correctly 1`] = `
 <div>
   <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
-  >
-    <svg
-      class="preloader__icon"
-      fill="none"
-      height="20"
-      viewBox="0 0 16 16"
-      width="20"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        clip-rule="evenodd"
-        d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-        fill="var(--color-primary-muted)"
-        fill-rule="evenodd"
-      />
-      <mask
-        height="16"
-        id="mask0"
-        mask-type="alpha"
-        maskUnits="userSpaceOnUse"
-        width="16"
-        x="0"
-        y="0"
-      >
-        <path
-          clip-rule="evenodd"
-          d="M8 13.7143C4.84409 13.7143 2.28571 11.1559 2.28571 8C2.28571 4.84409 4.84409 2.28571 8 2.28571C11.1559 2.28571 13.7143 4.84409 13.7143 8C13.7143 11.1559 11.1559 13.7143 8 13.7143ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z"
-          fill="var(--color-primary-default)"
-          fill-rule="evenodd"
-        />
-      </mask>
-      <g
-        mask="url(#mask0)"
-      >
-        <path
-          d="M6.85718 17.9999V11.4285V8.28564H-4.85711V17.9999H6.85718Z"
-          fill="var(--color-primary-default)"
-        />
-      </g>
-    </svg>
-  </div>
-  <div
-    class="mm-box mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
+    class="mm-box mm-box--padding-top-4 mm-box--padding-bottom-4 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center"
   >
     <svg
       class="preloader__icon"
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 7194d46a8119..f5a9a46acbb2 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
@@ -21,7 +21,6 @@ import {
 } from '../../../../../../helpers/constants/design-system';
 import { useConfirmContext } from '../../../../context/confirm';
 import { useDecodedTransactionData } from '../hooks/useDecodedTransactionData';
-import { ConfirmLoader } from '../shared/confirm-loader/confirm-loader';
 
 export const TransactionFlowSection = () => {
   const { currentConfirmation: transactionMeta } =
@@ -39,7 +38,7 @@ export const TransactionFlowSection = () => {
         addresses?.[addresses.length - 1].value;
 
   if (pending) {
-    return <ConfirmLoader />;
+    return null;
   }
 
   const { chainId } = transactionMeta;
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 83e707c30f85..3a2bc2989182 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -114,6 +114,10 @@ import NetworkConfirmationPopover from '../../components/multichain/network-list
 import NftFullImage from '../../components/app/assets/nfts/nft-details/nft-full-image';
 import CrossChainSwap from '../bridge';
 import { ToastMaster } from '../../components/app/toast-master/toast-master';
+import {
+  REDESIGN_APPROVAL_TYPES,
+  REDESIGN_DEV_TRANSACTION_TYPES,
+} from '../confirmations/utils';
 import {
   getConnectingLabel,
   hideAppHeader,
@@ -174,6 +178,9 @@ export default class Routes extends Component {
     currentExtensionPopupId: PropTypes.number,
     useRequestQueue: PropTypes.bool,
     clearEditedNetwork: PropTypes.func.isRequired,
+    oldestPendingApproval: PropTypes.object.isRequired,
+    pendingApprovals: PropTypes.arrayOf(PropTypes.object).isRequired,
+    transactionsMetadata: PropTypes.arrayOf(PropTypes.object).isRequired,
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal: PropTypes.bool.isRequired,
     hideShowKeyringSnapRemovalResultModal: PropTypes.func.isRequired,
@@ -419,6 +426,9 @@ export default class Routes extends Component {
       clearSwitchedNetworkDetails,
       clearEditedNetwork,
       privacyMode,
+      oldestPendingApproval,
+      pendingApprovals,
+      transactionsMetadata,
       ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
       isShowKeyringSnapRemovalResultModal,
       hideShowKeyringSnapRemovalResultModal,
@@ -454,7 +464,28 @@ export default class Routes extends Component {
       isUnlocked &&
       !shouldShowSeedPhraseReminder;
 
-    let isLoadingShown = isLoading && completedOnboarding;
+    const paramsConfirmationId = location.pathname.split(
+      '/confirm-transaction/',
+    )[1];
+    const confirmationId = paramsConfirmationId ?? oldestPendingApproval?.id;
+    const pendingApproval = pendingApprovals.find(
+      (approval) => approval.id === confirmationId,
+    );
+    const isCorrectApprovalType = REDESIGN_APPROVAL_TYPES.includes(
+      pendingApproval?.type,
+    );
+    const isCorrectDeveloperTransactionType =
+      REDESIGN_DEV_TRANSACTION_TYPES.includes(
+        transactionsMetadata[confirmationId]?.type,
+      );
+
+    let isLoadingShown =
+      isLoading &&
+      completedOnboarding &&
+      // In the redesigned screens, we hide the general loading spinner and the
+      // loading states are on a component by component basis.
+      !isCorrectApprovalType &&
+      !isCorrectDeveloperTransactionType;
 
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isLoadingShown =
@@ -464,7 +495,11 @@ export default class Routes extends Component {
         (confirmation) =>
           confirmation.type ===
           SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect,
-      );
+      ) &&
+      // In the redesigned screens, we hide the general loading spinner and the
+      // loading states are on a component by component basis.
+      !isCorrectApprovalType &&
+      !isCorrectDeveloperTransactionType;
     ///: END:ONLY_INCLUDE_IF
 
     return (
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 5c08e939d1d1..e0fe5575e2c2 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -22,6 +22,9 @@ import {
   getNumberOfAllUnapprovedTransactionsAndMessages,
   getUseRequestQueue,
   getCurrentNetwork,
+  oldestPendingConfirmationSelector,
+  getUnapprovedTransactions,
+  getPendingApprovals,
 } from '../../selectors';
 import {
   lockMetamask,
@@ -69,6 +72,10 @@ function mapStateToProps(state) {
     getNetworkToAutomaticallySwitchTo(state);
   const switchedNetworkDetails = getSwitchedNetworkDetails(state);
 
+  const oldestPendingApproval = oldestPendingConfirmationSelector(state);
+  const pendingApprovals = getPendingApprovals(state);
+  const transactionsMetadata = getUnapprovedTransactions(state);
+
   return {
     alertOpen,
     alertMessage,
@@ -114,6 +121,9 @@ function mapStateToProps(state) {
       selectSwitchedNetworkNeverShowMessage(state),
     currentExtensionPopupId: state.metamask.currentExtensionPopupId,
     useRequestQueue: getUseRequestQueue(state),
+    oldestPendingApproval,
+    pendingApprovals,
+    transactionsMetadata,
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     isShowKeyringSnapRemovalResultModal:
       state.appState.showKeyringRemovalSnapModal,

From 072c8c708913fc6f94b36eac84ed2848dbc4c1b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Tavares?= <joao.tavares@consensys.net>
Date: Thu, 14 Nov 2024 11:24:14 +0000
Subject: [PATCH 091/111] fix: ui customizations for redesigned transactions
 (#28443)
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/28443?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

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

## **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: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
---
 app/scripts/lib/transaction/metrics.ts | 2 +-
 app/scripts/metamask-controller.js     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 1e0e26dc1c20..3cdc14619b0d 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -998,7 +998,7 @@ async function buildEventFragmentProperties({
   }
   const isRedesignedConfirmationsDeveloperSettingEnabled =
     transactionMetricsRequest.getIsRedesignedConfirmationsDeveloperEnabled() ||
-    Boolean(process.env.ENABLE_CONFIRMATION_REDESIGN);
+    process.env.ENABLE_CONFIRMATION_REDESIGN === 'true';
 
   const isRedesignedTransactionsUserSettingEnabled =
     transactionMetricsRequest.getRedesignedTransactionsEnabled();
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 029d2b017e67..2f8a3a1fe807 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -6554,10 +6554,12 @@ export default class MetamaskController extends EventEmitter {
         );
       },
       getRedesignedConfirmationsEnabled: () => {
-        return this.preferencesController.getRedesignedConfirmationsEnabled;
+        return this.preferencesController.state.preferences
+          .redesignedConfirmationsEnabled;
       },
       getRedesignedTransactionsEnabled: () => {
-        return this.preferencesController.getRedesignedTransactionsEnabled;
+        return this.preferencesController.state.preferences
+          .redesignedTransactionsEnabled;
       },
       getMethodData: (data) => {
         if (!data) {

From 844104197fc1534aa497fbd636e777411d71776c Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Thu, 14 Nov 2024 19:40:01 +0700
Subject: [PATCH 092/111] test: Improve test for signatures (#27532)
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 current mock server setup injects all mocks at the beginning of the
test, which can lead to delays. Specifically, when we assert the account
details opened metric, only the relevant endpoint for that metric gets
triggered, while other mocks, like "signature approved," may not be
invoked yet. Although this doesn’t cause the test to fail, it results in
unnecessarily long wait times during the test, as the framework waits
for mocks that haven’t been triggered.

This PR addresses the issue by moving the metric assertions to the end
of the test. By doing so, we eliminate the idle waiting period,
streamlining the test flow and reducing overall test execution time.

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

## **Related issues**

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

## **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.
---
 .../confirmations/signatures/personal-sign.spec.ts    | 11 ++++++-----
 .../signatures/sign-typed-data-v3.spec.ts             | 10 ++++++----
 .../confirmations/signatures/sign-typed-data.spec.ts  | 11 +++++------
 test/e2e/tests/confirmations/signatures/siwe.spec.ts  | 11 ++++++-----
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts b/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts
index 418cc4ab513d..8444deab7c61 100644
--- a/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/personal-sign.spec.ts
@@ -43,17 +43,18 @@ describe('Confirmation Signature - Personal Sign @no-mmi', function (this: Suite
 
         await copyAddressAndPasteWalletAddress(driver);
         await assertPastedAddress(driver);
-        await assertAccountDetailsMetrics(
-          driver,
-          mockedEndpoints as MockedEndpoint[],
-          'personal_sign',
-        );
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
         await assertInfoValues(driver);
 
         await driver.clickElement('[data-testid="confirm-footer-button"]');
 
         await assertVerifiedPersonalMessage(driver, publicAddress);
+
+        await assertAccountDetailsMetrics(
+          driver,
+          mockedEndpoints as MockedEndpoint[],
+          'personal_sign',
+        );
         await assertSignatureConfirmedMetrics({
           driver,
           mockedEndpoints: mockedEndpoints as MockedEndpoint[],
diff --git a/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts b/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts
index 6961f0a5eaf2..a7f2e7b81691 100644
--- a/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/sign-typed-data-v3.spec.ts
@@ -47,15 +47,17 @@ describe('Confirmation Signature - Sign Typed Data V3 @no-mmi', function (this:
 
         await copyAddressAndPasteWalletAddress(driver);
         await assertPastedAddress(driver);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+        await driver.delay(1000);
+
+        await assertInfoValues(driver);
+        await scrollAndConfirmAndAssertConfirm(driver);
+
         await assertAccountDetailsMetrics(
           driver,
           mockedEndpoints as MockedEndpoint[],
           'eth_signTypedData_v3',
         );
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        await assertInfoValues(driver);
-        await scrollAndConfirmAndAssertConfirm(driver);
         await assertSignatureConfirmedMetrics({
           driver,
           mockedEndpoints: mockedEndpoints as MockedEndpoint[],
diff --git a/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts b/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts
index 1017d44a00dc..2f1c33fe4d07 100644
--- a/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/sign-typed-data.spec.ts
@@ -43,17 +43,16 @@ describe('Confirmation Signature - Sign Typed Data @no-mmi', function (this: Sui
 
         await copyAddressAndPasteWalletAddress(driver);
         await assertPastedAddress(driver);
-        await assertAccountDetailsMetrics(
-          driver,
-          mockedEndpoints as MockedEndpoint[],
-          'eth_signTypedData',
-        );
-
         await assertInfoValues(driver);
 
         await driver.clickElement('[data-testid="confirm-footer-button"]');
         await driver.delay(1000);
 
+        await assertAccountDetailsMetrics(
+          driver,
+          mockedEndpoints as MockedEndpoint[],
+          'eth_signTypedData',
+        );
         await assertSignatureConfirmedMetrics({
           driver,
           mockedEndpoints: mockedEndpoints as MockedEndpoint[],
diff --git a/test/e2e/tests/confirmations/signatures/siwe.spec.ts b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
index 889122eb22b8..9f261a28f569 100644
--- a/test/e2e/tests/confirmations/signatures/siwe.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
@@ -43,11 +43,6 @@ describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
 
         await copyAddressAndPasteWalletAddress(driver);
         await assertPastedAddress(driver);
-        await assertAccountDetailsMetrics(
-          driver,
-          mockedEndpoints as MockedEndpoint[],
-          'personal_sign',
-        );
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
         await assertInfoValues(driver);
         await scrollAndConfirmAndAssertConfirm(driver);
@@ -56,6 +51,12 @@ describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
           driver,
           '0xef8674a92d62a1876624547bdccaef6c67014ae821de18fa910fbff56577a65830f68848585b33d1f4b9ea1c3da1c1b11553b6aabe8446717daf7cd1e38a68271c',
         );
+
+        await assertAccountDetailsMetrics(
+          driver,
+          mockedEndpoints as MockedEndpoint[],
+          'personal_sign',
+        );
         await assertSignatureConfirmedMetrics({
           driver,
           mockedEndpoints: mockedEndpoints as MockedEndpoint[],

From c174ca76422166038f387ece519c1130c3673bea Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 14 Nov 2024 10:37:11 -0330
Subject: [PATCH 093/111] fix: Fix attribution generation (#28415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix the `attribution:generate` command by ensuring that it is possible
to install just production dependencies.

Previously the command `yarn workspaces focus --production` (used to
discard development dependencies, keeping just production dependencies
installed) would fail because `rimraf` was not found. `rimraf` was a
development dependency used in the `postinstall` script. This was
resolved by replacing `rimraf` with a Node.js script that does the same
thing without needing any dependency.

Once that failure was resolved, another was revealed. The
`allow-scripts` step of the installation began failing because there was
a package detected that had an install script that was missing from our
configuration. This package was in our configuration already, but the
`allow-scripts` configuration is sensitive to changes in the directory
structure of `node_modules`, and that structure changed due to
differences in which packages were hoisted in the production-only
install.

That failure was resolved by updating `generate-attributions.sh` to
remove the `allow-scripts` plugin while generating attributions. We
don't need `postinstall` scripts to run in order to read licences from
disk.

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

## **Related issues**

Fixes #28412

## **Manual testing steps**

1. Run `yarn attributions:generate`, and see that it completes
successfully
* Locally, it should also re-install the `allow-scripts` plugin and
development dependencies
* If this command is run with `CI=true` (e.g. `CI=true yarn
attributions:generate`), it will skip the step of re-installing the
`allow-scripts` plugin and development dependencies. This is what would
happen on CI, where the environment gets discarded after this is run so
there is no point in re-installing things.

## **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: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 .depcheckrc.yml                      |  1 -
 development/clear-webpack-cache.js   | 26 ++++++++++++++++++++++++++
 development/generate-attributions.sh | 11 ++++++++++-
 lavamoat/build-system/policy.json    | 18 ++----------------
 package.json                         |  3 +--
 yarn.lock                            |  1 -
 6 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100755 development/clear-webpack-cache.js

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 50b79a78ec30..5260be984692 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -70,7 +70,6 @@ ignores:
   - 'crypto-browserify' # polyfill
   - 'process' # polyfill
   - 'stream-http' # polyfill
-  - 'rimraf' # misc: install helper
   - 'json-schema-to-ts' # misc: typescript helper
   - 'https-browserify' # polyfill
   - 'path-browserify' # polyfill
diff --git a/development/clear-webpack-cache.js b/development/clear-webpack-cache.js
new file mode 100755
index 000000000000..c6435b59a0e0
--- /dev/null
+++ b/development/clear-webpack-cache.js
@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+const fs = require('node:fs/promises');
+const path = require('node:path');
+
+const WEBPACK_CACHE_DIRECTORY = path.resolve(
+  __dirname,
+  '..',
+  'node_modules',
+  '.cache',
+  'webpack',
+);
+
+/**
+ * Clear the Webpack cache.
+ *
+ * This is typically run in the `postinstall` npm/Yarn lifecycle script.
+ */
+async function main() {
+  await fs.rm(WEBPACK_CACHE_DIRECTORY, { force: true, recursive: true });
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/development/generate-attributions.sh b/development/generate-attributions.sh
index 6d4b335430e2..40de26bb0459 100755
--- a/development/generate-attributions.sh
+++ b/development/generate-attributions.sh
@@ -27,6 +27,13 @@ main() {
   # relative to the project root irrespective of where this script was run.
   cd "${PROJECT_DIRECTORY}"
 
+  # Remove allow-scripts plugin.
+  # Allow-scripts won't run correctly after a production-only install because the configuration
+  # includes exact paths to each dependency, and those paths can change in a production-only
+  # install because of the hoisting algorithm.
+  # We don't need postinstall scripts to run in order to generate attributions anyway.
+  yarn plugin remove @yarnpkg/plugin-allow-scripts
+
   # Instruct Yarn to only install production dependencies
   yarn workspaces focus --production
 
@@ -38,7 +45,9 @@ main() {
 
   # Check if the script is running in a CI environment (GitHub Actions sets the CI variable to true)
   if [ -z "${CI:-}" ]; then
-    # If not running in CI, restore development dependencies
+    # If not running in CI, restore the allow-scripts plugin and development dependencies.
+    cd "${PROJECT_DIRECTORY}"
+    git checkout -- .yarnrc.yml .yarn
     yarn
   fi
 }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 2d6b7ce3ad14..1cadff4100d7 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -3174,22 +3174,8 @@
         "__dirname": true
       },
       "packages": {
-        "eslint>file-entry-cache>flat-cache>flatted": true,
-        "eslint>file-entry-cache>flat-cache>rimraf": true
-      }
-    },
-    "eslint>file-entry-cache>flat-cache>rimraf": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "nyc>glob": true
+        "del>rimraf": true,
+        "eslint>file-entry-cache>flat-cache>flatted": true
       }
     },
     "eslint>glob-parent": {
diff --git a/package.json b/package.json
index 5be5168b34c2..5bd177799bb8 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "webpack": "tsx ./development/webpack/launch.ts",
-    "webpack:clearcache": "rimraf node_modules/.cache/webpack",
+    "webpack:clearcache": "./development/clear-webpack-cache.js",
     "postinstall": "yarn webpack:clearcache",
     "env:e2e": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn",
     "start": "yarn build:dev dev --apply-lavamoat=false --snow=false",
@@ -646,7 +646,6 @@
     "redux-mock-store": "^1.5.4",
     "remote-redux-devtools": "^0.5.16",
     "resolve-url-loader": "^3.1.5",
-    "rimraf": "^5.0.5",
     "sass-embedded": "^1.71.0",
     "sass-loader": "^14.1.1",
     "schema-utils": "^4.2.0",
diff --git a/yarn.lock b/yarn.lock
index 3eee3119dc71..b7afd1eb5884 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27024,7 +27024,6 @@ __metadata:
     remove-trailing-slash: "npm:^0.1.1"
     reselect: "npm:^3.0.1"
     resolve-url-loader: "npm:^3.1.5"
-    rimraf: "npm:^5.0.5"
     sass-embedded: "npm:^1.71.0"
     sass-loader: "npm:^14.1.1"
     schema-utils: "npm:^4.2.0"

From 1934a4e85c28b5bc9de7b5a4e54e0413f9d260a2 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:06:04 +0700
Subject: [PATCH 094/111] feat: add simulation metrics when simulation UI is
 not visible (#28427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR adds transaction simulation metrics when the UI is not shown and
the transaction simulation settings is turned on

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

## **Related issues**

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

## **Manual testing steps**
Turn on MetaMetrics settings

1. Go to wallet dashboard
2. Initiate send transaction directly through wallet
3. Reject or Cancel the transaction
4. Observe simulation metrics

## **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: Vinicius Stevam <vinicius.stevam@consensys.io>
Co-authored-by: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
---
 .../confirm/info/native-transfer/native-transfer.tsx  |  5 +++--
 .../info/nft-token-transfer/nft-token-transfer.tsx    |  5 +++--
 .../confirm/info/token-transfer/token-transfer.tsx    |  5 +++--
 .../simulation-details/simulation-details.test.tsx    | 11 ++++++++++-
 .../simulation-details/simulation-details.tsx         |  7 +++++++
 5 files changed, 26 insertions(+), 7 deletions(-)

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 c098936989dd..f3433511fd01 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
@@ -19,15 +19,16 @@ const NativeTransferInfo = () => {
     <>
       <NativeSendHeading />
       <TransactionFlowSection />
-      {!isWalletInitiated && (
+      {
         <ConfirmInfoSection noPadding>
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
             enableMetrics
+            metricsOnly={isWalletInitiated}
           />
         </ConfirmInfoSection>
-      )}
+      }
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
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 113920a6aec2..2911e32f7696 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
@@ -19,15 +19,16 @@ const NFTTokenTransferInfo = () => {
     <>
       <NFTSendHeading />
       <TransactionFlowSection />
-      {!isWalletInitiated && (
+      {
         <ConfirmInfoSection noPadding>
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
             enableMetrics
+            metricsOnly={isWalletInitiated}
           />
         </ConfirmInfoSection>
-      )}
+      }
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
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 50e9d85936f0..dd95e841c2c0 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
@@ -19,15 +19,16 @@ const TokenTransferInfo = () => {
     <>
       <SendHeading />
       <TransactionFlowSection />
-      {!isWalletInitiated && (
+      {
         <ConfirmInfoSection noPadding>
           <SimulationDetails
             transaction={transactionMeta}
             isTransactionsRedesign
             enableMetrics
+            metricsOnly={isWalletInitiated}
           />
         </ConfirmInfoSection>
-      )}
+      }
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
index 9294f7d1b5b5..e312de542772 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.test.tsx
@@ -41,12 +41,16 @@ jest.mock('../../context/confirm', () => ({
   })),
 }));
 
-const renderSimulationDetails = (simulationData?: Partial<SimulationData>) =>
+const renderSimulationDetails = (
+  simulationData?: Partial<SimulationData>,
+  metricsOnly?: boolean,
+) =>
   renderWithProvider(
     <SimulationDetails
       transaction={
         { id: 'testTransactionId', simulationData } as TransactionMeta
       }
+      metricsOnly={metricsOnly}
     />,
     store,
   );
@@ -141,4 +145,9 @@ describe('SimulationDetails', () => {
       {},
     );
   });
+
+  it('does not render any UI elements when metricsOnly is true', () => {
+    const { container } = renderSimulationDetails({}, true);
+    expect(container).toBeEmptyDOMElement();
+  });
 });
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 57ee1f2ff3fb..357f71230a0c 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -34,6 +34,7 @@ import { useSimulationMetrics } from './useSimulationMetrics';
 export type SimulationDetailsProps = {
   enableMetrics?: boolean;
   isTransactionsRedesign?: boolean;
+  metricsOnly?: boolean;
   transaction: TransactionMeta;
 };
 
@@ -225,11 +226,13 @@ const SimulationDetailsLayout: React.FC<{
  * @param props.enableMetrics - Whether to enable simulation metrics.
  * @param props.isTransactionsRedesign - Whether or not the component is being
  * used inside the transaction redesign flow.
+ * @param props.metricsOnly - Whether to only track metrics and not render the UI.
  */
 export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
   transaction,
   enableMetrics = false,
   isTransactionsRedesign = false,
+  metricsOnly = false,
 }: SimulationDetailsProps) => {
   const t = useI18nContext();
   const { chainId, id: transactionId, simulationData } = transaction;
@@ -244,6 +247,10 @@ export const SimulationDetails: React.FC<SimulationDetailsProps> = ({
     transactionId,
   });
 
+  if (metricsOnly) {
+    return null;
+  }
+
   if (loading) {
     return (
       <SimulationDetailsLayout

From 12246e1b207e52fbd4797bdbe177732b1bf7b0da Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 14 Nov 2024 13:27:42 -0600
Subject: [PATCH 095/111] fix: Allow outerclick to close import modal (#28448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Clicking outside of modals is generally an assumed "now close the modal"
interaction.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Open the Import Tokens modal
2. Click the background
3. See the modal go away

## **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.
---
 .../multichain/import-tokens-modal/import-tokens-modal.js        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
index 0123bc91b147..b9ef596b8f07 100644
--- a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
+++ b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
@@ -493,7 +493,6 @@ export const ImportTokensModal = ({ onClose }) => {
   return (
     <Modal
       isOpen
-      isClosedOnOutsideClick={false}
       onClose={() => {
         dispatch(clearPendingTokens());
         onClose();

From 1c8bfffc24b84f3a8bd9f89c789316e344db2b40 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Thu, 14 Nov 2024 11:45:21 -0800
Subject: [PATCH 096/111] fix: dont poll token prices during onboarding or when
 locked (#28465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes an issue where token prices were polled during onboarding, or when
the extension is locked.

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

## **Related issues**


## **Manual testing steps**

1. Start the onboarding process
2. Open background page in dev console
3. Verify no requests to price api or crypto compare
4. Finish onboarding
5. Verify requests start flowing to price api and crypto compare
6. lock the wallet
7. Verify no requests to price api or crypto compare
8. unlock the wallet
9. Verify requests start flowing to price api and crypto compare

## **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.
---
 ui/hooks/useCurrencyRatePolling.ts | 10 ++++++++--
 ui/hooks/useTokenRatesPolling.ts   | 12 +++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ui/hooks/useCurrencyRatePolling.ts b/ui/hooks/useCurrencyRatePolling.ts
index e7ad21adedf5..34772a94a501 100644
--- a/ui/hooks/useCurrencyRatePolling.ts
+++ b/ui/hooks/useCurrencyRatePolling.ts
@@ -7,14 +7,20 @@ import {
   currencyRateStartPolling,
   currencyRateStopPollingByPollingToken,
 } from '../store/actions';
-import { getCompletedOnboarding } from '../ducks/metamask/metamask';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
 import usePolling from './usePolling';
 
 const useCurrencyRatePolling = () => {
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
+  const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
+
   const nativeCurrencies = [
     ...new Set(
       Object.values(networkConfigurations).map((n) => n.nativeCurrency),
@@ -25,7 +31,7 @@ const useCurrencyRatePolling = () => {
     startPolling: currencyRateStartPolling,
     stopPollingByPollingToken: currencyRateStopPollingByPollingToken,
     input: nativeCurrencies,
-    enabled: useCurrencyRateCheck && completedOnboarding,
+    enabled,
   });
 };
 
diff --git a/ui/hooks/useTokenRatesPolling.ts b/ui/hooks/useTokenRatesPolling.ts
index 41c1c8793b97..a740a426e36c 100644
--- a/ui/hooks/useTokenRatesPolling.ts
+++ b/ui/hooks/useTokenRatesPolling.ts
@@ -10,10 +10,16 @@ import {
   tokenRatesStartPolling,
   tokenRatesStopPollingByPollingToken,
 } from '../store/actions';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
 import useMultiPolling from './useMultiPolling';
 
 const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
   // Selectors to determine polling input
+  const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
@@ -22,12 +28,12 @@ const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
   const tokensMarketData = useSelector(getTokensMarketData);
   const marketData = useSelector(getMarketData);
 
+  const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
+
   useMultiPolling({
     startPolling: tokenRatesStartPolling,
     stopPollingByPollingToken: tokenRatesStopPollingByPollingToken,
-    input: useCurrencyRateCheck
-      ? chainIds ?? Object.keys(networkConfigurations)
-      : [],
+    input: enabled ? chainIds ?? Object.keys(networkConfigurations) : [],
   });
 
   return {

From 2367e4e1a6a5b29f83bdb8e7e81b0974ce889812 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 15 Nov 2024 17:20:28 +0530
Subject: [PATCH 097/111] feat: UI changes to show decoding data for permits
 (#28342)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Changes in permit simulation component to show decoding api results if
present. Changes will currently not be visible as signature controller
update is not yet done.

## **Related issues**

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

## **Manual testing steps**

1. Locally enable signature decoding using env variables
2. Submit a permit on test dapp
3. Check simulation section

## **Screenshots/Recordings**
<img width="360" alt="Screenshot 2024-11-07 at 3 07 29 PM"
src="https://github.com/user-attachments/assets/57097f47-f0db-461a-a1f6-ca62f397ea93">

## **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
- [ ] 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>
---
 .../static-simulation/static-simulation.tsx   |  18 +-
 .../permit-simulation.test.tsx.snap           |  43 ++-
 .../decoded-simulation.test.tsx.snap          |   9 +
 .../decoded-simulation.test.tsx               |  21 ++
 .../decoded-simulation/decoded-simulation.tsx |   7 +
 .../decoded-simulation/index.ts               |   1 +
 .../default-simulation.test.tsx.snap          | 246 ++++++++++++++++++
 .../default-simulation.test.tsx               |  60 +++++
 .../default-simulation/default-simulation.tsx | 118 +++++++++
 .../default-simulation/index.ts               |   1 +
 .../permit-simulation.test.tsx                |  51 +++-
 .../permit-simulation/permit-simulation.tsx   | 120 +--------
 ui/pages/confirmations/types/confirm.ts       |   3 +
 13 files changed, 566 insertions(+), 132 deletions(-)
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/__snapshots__/decoded-simulation.test.tsx.snap
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.test.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/index.ts
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/__snapshots__/default-simulation.test.tsx.snap
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.test.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/index.ts

diff --git a/ui/pages/confirmations/components/confirm/info/shared/static-simulation/static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/shared/static-simulation/static-simulation.tsx
index 7901854b91d1..cf8ad9cd5773 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/static-simulation/static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/static-simulation/static-simulation.tsx
@@ -1,22 +1,36 @@
 import React from 'react';
+
+import { Box } from '../../../../../../../components/component-library';
 import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
 } from '../../../../../../../components/app/confirm/info/row';
 import { ConfirmInfoSection } from '../../../../../../../components/app/confirm/info/row/section';
+import {
+  Display,
+  JustifyContent,
+} from '../../../../../../../helpers/constants/design-system';
+import Preloader from '../../../../../../../components/ui/icon/preloader';
 
 const StaticSimulation: React.FC<{
   title: string;
   titleTooltip: string;
   description: string;
   simulationElements: React.ReactNode;
-}> = ({ title, titleTooltip, description, simulationElements }) => {
+  isLoading?: boolean;
+}> = ({ title, titleTooltip, description, simulationElements, isLoading }) => {
   return (
     <ConfirmInfoSection data-testid="confirmation__simulation_section">
       <ConfirmInfoRow label={title} tooltip={titleTooltip}>
         <ConfirmInfoRowText text={description} />
       </ConfirmInfoRow>
-      {simulationElements}
+      {isLoading ? (
+        <Box display={Display.Flex} justifyContent={JustifyContent.center}>
+          <Preloader size={20} />
+        </Box>
+      ) : (
+        simulationElements
+      )}
     </ConfirmInfoSection>
   );
 };
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index f35e2218cbfb..16e7f5fa79d9 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -1,6 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PermitSimulation renders component correctly 1`] = `
+exports[`PermitSimulation should not render default simulation if decodingLoading is true 1`] = `
+<div>
+  <div>
+    "DECODED SIMULATION IMPLEMENTATION"
+  </div>
+</div>
+`;
+
+exports[`PermitSimulation should render default simulation if decoding api does not return result 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"
@@ -128,7 +136,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
 </div>
 `;
 
-exports[`PermitSimulation renders correctly for NFT permit 1`] = `
+exports[`PermitSimulation should render default simulation if decoding api returns error 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"
@@ -173,7 +181,7 @@ exports[`PermitSimulation renders correctly for NFT permit 1`] = `
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
           style="white-space: pre-wrap;"
         >
-          You're giving someone else permission to withdraw NFTs from your account.
+          You're giving the spender permission to spend this many tokens from your account.
         </p>
       </div>
     </div>
@@ -190,7 +198,7 @@ exports[`PermitSimulation renders correctly for NFT permit 1`] = `
           <p
             class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
           >
-            Withdraw
+            Spending cap
           </p>
         </div>
       </div>
@@ -207,14 +215,25 @@ exports[`PermitSimulation renders correctly for NFT permit 1`] = `
             <div
               class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline mm-box--min-width-0"
             >
-              <div>
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
-                  data-testid="simulation-token-value"
-                  style="padding-top: 1px; padding-bottom: 1px;"
+              <div
+                style="min-width: 0;"
+              >
+                <div
+                  aria-describedby="tippy-tooltip-4"
+                  class=""
+                  data-original-title="30"
+                  data-tooltipped=""
+                  style="display: inline;"
+                  tabindex="0"
                 >
-                  #3606393
-                </p>
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                    data-testid="simulation-token-value"
+                    style="padding-top: 1px; padding-bottom: 1px;"
+                  >
+                    30
+                  </p>
+                </div>
               </div>
             </div>
             <div
@@ -230,7 +249,7 @@ exports[`PermitSimulation renders correctly for NFT permit 1`] = `
                 <p
                   class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
                 >
-                  0xC3644...1FE88
+                  0xCcCCc...ccccC
                 </p>
               </div>
             </div>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/__snapshots__/decoded-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/__snapshots__/decoded-simulation.test.tsx.snap
new file mode 100644
index 000000000000..9c190acccee9
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/__snapshots__/decoded-simulation.test.tsx.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DecodedSimulation renders component correctly 1`] = `
+<div>
+  <div>
+    "DECODED SIMULATION IMPLEMENTATION"
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.test.tsx
new file mode 100644
index 000000000000..00e0fbadb496
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.test.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+
+import { getMockTypedSignConfirmStateForRequest } from '../../../../../../../../../test/data/confirmations/helper';
+import { renderWithConfirmContextProvider } from '../../../../../../../../../test/lib/confirmations/render-helpers';
+import { permitSignatureMsg } from '../../../../../../../../../test/data/confirmations/typed_sign';
+import PermitSimulation from './decoded-simulation';
+
+describe('DecodedSimulation', () => {
+  it('renders component correctly', async () => {
+    const state = getMockTypedSignConfirmStateForRequest(permitSignatureMsg);
+    const mockStore = configureMockStore([])(state);
+
+    const { container } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.tsx
new file mode 100644
index 000000000000..f4767dbee264
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/decoded-simulation.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const DecodedSimulation: React.FC<object> = () => (
+  <div>"DECODED SIMULATION IMPLEMENTATION"</div>
+);
+
+export default DecodedSimulation;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/index.ts b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/index.ts
new file mode 100644
index 000000000000..a13982b1b09d
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/decoded-simulation/index.ts
@@ -0,0 +1 @@
+export { default as DecodedSimulation } from './decoded-simulation';
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/__snapshots__/default-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/__snapshots__/default-simulation.test.tsx.snap
new file mode 100644
index 000000000000..a378d0befcc4
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/__snapshots__/default-simulation.test.tsx.snap
@@ -0,0 +1,246 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DefaultSimulation renders component 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__simulation_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-center mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
+      >
+        <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"
+          >
+            Estimated changes
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-1"
+              class=""
+              data-original-title="Estimated changes are what might happen if you go through with this transaction. This is just a prediction, not a guarantee."
+              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"
+                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 mm-box--min-width-0"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          You're giving the spender permission to spend this many tokens from your account.
+        </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-center mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
+      >
+        <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"
+          >
+            Spending cap
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box"
+        style="margin-left: auto; max-width: 100%;"
+      >
+        <div
+          class="mm-box"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--justify-content-flex-end"
+          >
+            <div
+              class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline mm-box--min-width-0"
+            >
+              <div
+                style="min-width: 0;"
+              >
+                <div
+                  aria-describedby="tippy-tooltip-2"
+                  class=""
+                  data-original-title="30"
+                  data-tooltipped=""
+                  style="display: inline;"
+                  tabindex="0"
+                >
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                    data-testid="simulation-token-value"
+                    style="padding-top: 1px; padding-bottom: 1px;"
+                  >
+                    30
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex"
+            >
+              <div
+                class="name name__missing"
+              >
+                <span
+                  class="mm-box name__icon mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
+                  style="mask-image: url('./images/icons/question.svg');"
+                />
+                <p
+                  class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
+                >
+                  0xCcCCc...ccccC
+                </p>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mm-box"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`DefaultSimulation renders correctly for NFT permit 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__simulation_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-center mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
+      >
+        <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"
+          >
+            Estimated changes
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-3"
+              class=""
+              data-original-title="Estimated changes are what might happen if you go through with this transaction. This is just a prediction, not a guarantee."
+              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"
+                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 mm-box--min-width-0"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          You're giving someone else permission to withdraw NFTs from your account.
+        </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-center mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
+      >
+        <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"
+          >
+            Withdraw
+          </p>
+        </div>
+      </div>
+      <div
+        class="mm-box"
+        style="margin-left: auto; max-width: 100%;"
+      >
+        <div
+          class="mm-box"
+        >
+          <div
+            class="mm-box mm-box--display-flex mm-box--justify-content-flex-end"
+          >
+            <div
+              class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline mm-box--min-width-0"
+            >
+              <div>
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                  data-testid="simulation-token-value"
+                  style="padding-top: 1px; padding-bottom: 1px;"
+                >
+                  #3606393
+                </p>
+              </div>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex"
+            >
+              <div
+                class="name name__missing"
+              >
+                <span
+                  class="mm-box name__icon mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
+                  style="mask-image: url('./images/icons/question.svg');"
+                />
+                <p
+                  class="mm-box mm-text name__value mm-text--body-md mm-box--color-text-default"
+                >
+                  0xC3644...1FE88
+                </p>
+              </div>
+            </div>
+          </div>
+          <div
+            class="mm-box"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.test.tsx
new file mode 100644
index 000000000000..b9e095292bce
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.test.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { act } from 'react-dom/test-utils';
+
+import { getMockTypedSignConfirmStateForRequest } from '../../../../../../../../../test/data/confirmations/helper';
+import { renderWithConfirmContextProvider } from '../../../../../../../../../test/lib/confirmations/render-helpers';
+import {
+  permitNFTSignatureMsg,
+  permitSignatureMsg,
+} from '../../../../../../../../../test/data/confirmations/typed_sign';
+import { memoizedGetTokenStandardAndDetails } from '../../../../../../utils/token';
+import DefaultSimulation from './default-simulation';
+
+jest.mock('../../../../../../../../store/actions', () => {
+  return {
+    getTokenStandardAndDetails: jest
+      .fn()
+      .mockResolvedValue({ decimals: 2, standard: 'ERC20' }),
+  };
+});
+
+describe('DefaultSimulation', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+
+    /** Reset memoized function using getTokenStandardAndDetails for each test */
+    memoizedGetTokenStandardAndDetails?.cache?.clear?.();
+  });
+
+  it('renders component correctly', async () => {
+    const state = getMockTypedSignConfirmStateForRequest(permitSignatureMsg);
+    const mockStore = configureMockStore([])(state);
+
+    await act(async () => {
+      const { container, findByText } = renderWithConfirmContextProvider(
+        <DefaultSimulation />,
+        mockStore,
+      );
+
+      expect(await findByText('30')).toBeInTheDocument();
+      expect(container).toMatchSnapshot();
+    });
+  });
+
+  it('renders correctly for NFT permit', async () => {
+    const state = getMockTypedSignConfirmStateForRequest(permitNFTSignatureMsg);
+    const mockStore = configureMockStore([])(state);
+
+    await act(async () => {
+      const { container, findByText } = renderWithConfirmContextProvider(
+        <DefaultSimulation />,
+        mockStore,
+      );
+
+      expect(await findByText('Withdraw')).toBeInTheDocument();
+      expect(await findByText('#3606393')).toBeInTheDocument();
+      expect(container).toMatchSnapshot();
+    });
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.tsx
new file mode 100644
index 000000000000..c39a88585e35
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/default-simulation.tsx
@@ -0,0 +1,118 @@
+import { Hex } from '@metamask/utils';
+import React from 'react';
+import { PrimaryType } from '../../../../../../../../../shared/constants/signatures';
+import { parseTypedDataMessage } from '../../../../../../../../../shared/modules/transaction.utils';
+import { ConfirmInfoRow } from '../../../../../../../../components/app/confirm/info/row';
+import { Box } from '../../../../../../../../components/component-library';
+import {
+  Display,
+  FlexDirection,
+} from '../../../../../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../../../../../hooks/useI18nContext';
+import { useConfirmContext } from '../../../../../../context/confirm';
+import { SignatureRequestType } from '../../../../../../types/confirm';
+import StaticSimulation from '../../../shared/static-simulation/static-simulation';
+import PermitSimulationValueDisplay from '../value-display/value-display';
+
+function extractTokenDetailsByPrimaryType(
+  message: Record<string, unknown>,
+  primaryType: PrimaryType,
+): object[] | unknown {
+  let tokenDetails;
+
+  switch (primaryType) {
+    case PrimaryType.PermitBatch:
+    case PrimaryType.PermitSingle:
+      tokenDetails = message?.details;
+      break;
+    case PrimaryType.PermitBatchTransferFrom:
+    case PrimaryType.PermitTransferFrom:
+      tokenDetails = message?.permitted;
+      break;
+    default:
+      break;
+  }
+
+  const isNonArrayObject = tokenDetails && !Array.isArray(tokenDetails);
+
+  return isNonArrayObject ? [tokenDetails] : tokenDetails;
+}
+
+const DefaultPermitSimulation: React.FC<object> = () => {
+  const t = useI18nContext();
+  const { currentConfirmation } = useConfirmContext<SignatureRequestType>();
+  const msgData = currentConfirmation.msgParams?.data;
+  const chainId = currentConfirmation.chainId as Hex;
+  const {
+    domain: { verifyingContract },
+    message,
+    message: { tokenId },
+    primaryType,
+  } = parseTypedDataMessage(msgData as string);
+  const isNFT = tokenId !== undefined;
+
+  const tokenDetails = extractTokenDetailsByPrimaryType(message, primaryType);
+
+  const TokenDetail = ({
+    token,
+    amount,
+    i,
+  }: {
+    token: Hex | string;
+    amount: number | string;
+    i: number;
+  }) => (
+    <PermitSimulationValueDisplay
+      key={`${token}-${i}`}
+      primaryType={primaryType}
+      tokenContract={token}
+      value={amount}
+      chainId={chainId}
+    />
+  );
+
+  const SpendingCapRow = (
+    <ConfirmInfoRow
+      label={t(isNFT ? 'simulationApproveHeading' : 'spendingCap')}
+    >
+      <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
+        {Array.isArray(tokenDetails) ? (
+          <Box
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
+            gap={2}
+          >
+            {tokenDetails.map(
+              (
+                { token, amount }: { token: string; amount: string },
+                i: number,
+              ) => (
+                <TokenDetail token={token} amount={amount} i={i} />
+              ),
+            )}
+          </Box>
+        ) : (
+          <PermitSimulationValueDisplay
+            tokenContract={verifyingContract}
+            value={message.value}
+            tokenId={message.tokenId}
+            chainId={chainId}
+          />
+        )}
+      </Box>
+    </ConfirmInfoRow>
+  );
+
+  return (
+    <StaticSimulation
+      title={t('simulationDetailsTitle')}
+      titleTooltip={t('simulationDetailsTitleTooltip')}
+      description={t(
+        isNFT ? 'simulationDetailsApproveDesc' : 'permitSimulationDetailInfo',
+      )}
+      simulationElements={SpendingCapRow}
+    />
+  );
+};
+
+export default DefaultPermitSimulation;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/index.ts b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/index.ts
new file mode 100644
index 000000000000..b9f6c48b65db
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/default-simulation/index.ts
@@ -0,0 +1 @@
+export { default as DefaultSimulation } from './default-simulation';
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
index 0d67715867d9..d0183d1ac2e7 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { act } from 'react-dom/test-utils';
+import { waitFor } from '@testing-library/dom';
 
 import { getMockTypedSignConfirmStateForRequest } from '../../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../../test/lib/confirmations/render-helpers';
-import {
-  permitNFTSignatureMsg,
-  permitSignatureMsg,
-} from '../../../../../../../../test/data/confirmations/typed_sign';
+import { permitSignatureMsg } from '../../../../../../../../test/data/confirmations/typed_sign';
 import { memoizedGetTokenStandardAndDetails } from '../../../../../utils/token';
 import PermitSimulation from './permit-simulation';
 
@@ -27,8 +25,12 @@ describe('PermitSimulation', () => {
     memoizedGetTokenStandardAndDetails?.cache?.clear?.();
   });
 
-  it('renders component correctly', async () => {
-    const state = getMockTypedSignConfirmStateForRequest(permitSignatureMsg);
+  it('should render default simulation if decoding api does not return result', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: undefined,
+    });
     const mockStore = configureMockStore([])(state);
 
     await act(async () => {
@@ -42,8 +44,18 @@ describe('PermitSimulation', () => {
     });
   });
 
-  it('renders correctly for NFT permit', async () => {
-    const state = getMockTypedSignConfirmStateForRequest(permitNFTSignatureMsg);
+  it('should render default simulation if decoding api returns error', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: {
+        stateChanges: null,
+        error: {
+          message: 'some error',
+          type: 'SOME_ERROR',
+        },
+      },
+    });
     const mockStore = configureMockStore([])(state);
 
     await act(async () => {
@@ -52,9 +64,28 @@ describe('PermitSimulation', () => {
         mockStore,
       );
 
-      expect(await findByText('Withdraw')).toBeInTheDocument();
-      expect(await findByText('#3606393')).toBeInTheDocument();
+      expect(await findByText('30')).toBeInTheDocument();
       expect(container).toMatchSnapshot();
     });
   });
+
+  it('should not render default simulation if decodingLoading is true', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: true,
+    });
+    const mockStore = configureMockStore([])(state);
+
+    await act(async () => {
+      const { container, queryByTestId } = renderWithConfirmContextProvider(
+        <PermitSimulation />,
+        mockStore,
+      );
+
+      await waitFor(() => {
+        expect(queryByTestId('30')).not.toBeInTheDocument();
+        expect(container).toMatchSnapshot();
+      });
+    });
+  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 855f7837ba42..0b4d9eed22d4 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -1,118 +1,22 @@
-import { Hex } from '@metamask/utils';
 import React from 'react';
-import { PrimaryType } from '../../../../../../../../shared/constants/signatures';
-import { parseTypedDataMessage } from '../../../../../../../../shared/modules/transaction.utils';
-import { ConfirmInfoRow } from '../../../../../../../components/app/confirm/info/row';
-import { Box } from '../../../../../../../components/component-library';
-import {
-  Display,
-  FlexDirection,
-} from '../../../../../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
-import { useConfirmContext } from '../../../../../context/confirm';
-import { SignatureRequestType } from '../../../../../types/confirm';
-import StaticSimulation from '../../shared/static-simulation/static-simulation';
-import PermitSimulationValueDisplay from './value-display/value-display';
-
-function extractTokenDetailsByPrimaryType(
-  message: Record<string, unknown>,
-  primaryType: PrimaryType,
-): object[] | unknown {
-  let tokenDetails;
-
-  switch (primaryType) {
-    case PrimaryType.PermitBatch:
-    case PrimaryType.PermitSingle:
-      tokenDetails = message?.details;
-      break;
-    case PrimaryType.PermitBatchTransferFrom:
-    case PrimaryType.PermitTransferFrom:
-      tokenDetails = message?.permitted;
-      break;
-    default:
-      break;
-  }
-
-  const isNonArrayObject = tokenDetails && !Array.isArray(tokenDetails);
 
-  return isNonArrayObject ? [tokenDetails] : tokenDetails;
-}
+import { SignatureRequestType } from '../../../../../types/confirm';
+import { useConfirmContext } from '../../../../../context/confirm';
+import { DefaultSimulation } from './default-simulation';
+import { DecodedSimulation } from './decoded-simulation';
 
 const PermitSimulation: React.FC<object> = () => {
-  const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext<SignatureRequestType>();
-  const msgData = currentConfirmation.msgParams?.data;
-  const chainId = currentConfirmation.chainId as Hex;
-  const {
-    domain: { verifyingContract },
-    message,
-    message: { tokenId },
-    primaryType,
-  } = parseTypedDataMessage(msgData as string);
-  const isNFT = tokenId !== undefined;
-
-  const tokenDetails = extractTokenDetailsByPrimaryType(message, primaryType);
+  const { decodingLoading, decodingData } = currentConfirmation;
 
-  const TokenDetail = ({
-    token,
-    amount,
-    i,
-  }: {
-    token: Hex | string;
-    amount: number | string;
-    i: number;
-  }) => (
-    <PermitSimulationValueDisplay
-      key={`${token}-${i}`}
-      primaryType={primaryType}
-      tokenContract={token}
-      value={amount}
-      chainId={chainId}
-    />
-  );
-
-  const SpendingCapRow = (
-    <ConfirmInfoRow
-      label={t(isNFT ? 'simulationApproveHeading' : 'spendingCap')}
-    >
-      <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
-        {Array.isArray(tokenDetails) ? (
-          <Box
-            display={Display.Flex}
-            flexDirection={FlexDirection.Column}
-            gap={2}
-          >
-            {tokenDetails.map(
-              (
-                { token, amount }: { token: string; amount: string },
-                i: number,
-              ) => (
-                <TokenDetail token={token} amount={amount} i={i} />
-              ),
-            )}
-          </Box>
-        ) : (
-          <PermitSimulationValueDisplay
-            tokenContract={verifyingContract}
-            value={message.value}
-            tokenId={message.tokenId}
-            chainId={chainId}
-          />
-        )}
-      </Box>
-    </ConfirmInfoRow>
-  );
+  if (
+    decodingData?.error ||
+    (decodingData === undefined && decodingLoading !== true)
+  ) {
+    return <DefaultSimulation />;
+  }
 
-  return (
-    <StaticSimulation
-      title={t('simulationDetailsTitle')}
-      titleTooltip={t('simulationDetailsTitleTooltip')}
-      description={t(
-        isNFT ? 'simulationDetailsApproveDesc' : 'permitSimulationDetailInfo',
-      )}
-      simulationElements={SpendingCapRow}
-    />
-  );
+  return <DecodedSimulation />;
 };
 
 export default PermitSimulation;
diff --git a/ui/pages/confirmations/types/confirm.ts b/ui/pages/confirmations/types/confirm.ts
index b7c0c1160b3c..fd344fcc2354 100644
--- a/ui/pages/confirmations/types/confirm.ts
+++ b/ui/pages/confirmations/types/confirm.ts
@@ -1,4 +1,5 @@
 import { ApprovalControllerState } from '@metamask/approval-controller';
+import { DecodingData } from '@metamask/signature-controller';
 import { SIWEMessage } from '@metamask/controller-utils';
 import {
   TransactionMeta,
@@ -38,6 +39,8 @@ export type SignatureRequestType = {
   type: TransactionType;
   custodyId?: string;
   securityAlertResponse?: SecurityAlertResponse;
+  decodingLoading?: boolean;
+  decodingData?: DecodingData;
 };
 
 export type Confirmation = SignatureRequestType | TransactionMeta;

From 5990644e199e66f0d1023ea2d967015d41b43c33 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:34:08 +0100
Subject: [PATCH 098/111] test: [POM] Migrate vault decryption e2e tests to TS
 and Page Object Model  (#28419)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate e2e tests `test/e2e/vault-decryption-chrome.spec.js` to TS and
Page Object Model, this test runs only on develop branch, by migrating
to POM, we improve the maintainability.
- Create page classe functions for vault decryption page, so we can use
that in the future when needed
- Deprecate/remove old functions in `helper.js`
- Improved testing logs to make it easier to debug. See testing logs on
this branch:

![Screenshot 2024-11-13 at 10 11
41](https://github.com/user-attachments/assets/a592b127-2fc2-4f33-a569-7e56f72a05f1)



[![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/28431

## **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/helpers.js                           | 157 ---------
 .../e2e/page-objects/flows/onboarding.flow.ts |  73 ++++-
 .../pages/settings/privacy-settings.ts        |  12 +-
 .../pages/vault-decryptor-page.ts             |  96 ++++++
 .../onboarding-with-opt-out.spec.ts           |   6 +-
 .../onboarding-infura-call-privacy.spec.ts    |   2 +-
 .../settings-security-reveal-srp.spec.ts      |   4 +-
 test/e2e/vault-decryption-chrome.spec.js      | 293 -----------------
 test/e2e/vault-decryption-chrome.spec.ts      | 298 ++++++++++++++++++
 9 files changed, 475 insertions(+), 466 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/vault-decryptor-page.ts
 delete mode 100644 test/e2e/vault-decryption-chrome.spec.js
 create mode 100644 test/e2e/vault-decryption-chrome.spec.ts

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 4bec0737472f..a40edadf7c69 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -486,143 +486,6 @@ const onboardingPinExtension = async (driver) => {
   await driver.clickElement('[data-testid="pin-extension-done"]');
 };
 
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * Completes the onboarding flow with optional opt-out settings for wallet creation.
- *
- * This function navigates through the onboarding process, allowing for opt-out of certain features.
- * It waits for the appropriate heading to appear, then proceeds to opt-out of third-party API
- * integration for general and assets sections if specified in the optOutOptions.
- * @param {WebDriver} driver - The Selenium WebDriver instance.
- * @param {object} optOutOptions - Optional. An object specifying which features to opt-out of.
- * @param {boolean} optOutOptions.basicFunctionality - Optional. Defaults to true. Opt-out of basic functionality.
- * @param {boolean} optOutOptions.profileSync - Optional. Defaults to true. Opt-out of profile sync.
- * @param {boolean} optOutOptions.assets - Optional. Defaults to true. Opt-out of assets options.
- * @param {boolean} optOutOptions.isNewWallet - Optional. Defaults to true. Indicates if this is a new wallet creation.
- */
-const onboardingCompleteWalletCreationWithOptOut = async (
-  driver,
-  optOutOptions = {},
-) => {
-  const defaultOptOutOptions = {
-    basicFunctionality: true,
-    profileSync: true,
-    assets: true,
-    isNewWallet: true,
-  };
-
-  const optOutOptionsToUse = { ...defaultOptOutOptions, ...optOutOptions };
-
-  // wait for h2 to appear
-  await driver.findElement({
-    text: optOutOptionsToUse.isNewWallet
-      ? 'Congratulations'
-      : 'Your wallet is ready',
-    tag: 'h2',
-  });
-
-  // opt-out from third party API on general section
-  await driver.clickElementAndWaitToDisappear({
-    text: 'Manage default privacy settings',
-    tag: 'button',
-  });
-  await driver.clickElement({ text: 'General', tag: 'p' });
-
-  if (optOutOptionsToUse.basicFunctionality) {
-    await driver.clickElement(
-      '[data-testid="basic-functionality-toggle"] .toggle-button',
-    );
-    await driver.clickElement('[id="basic-configuration-checkbox"]');
-    await driver.clickElementAndWaitToDisappear({
-      tag: 'button',
-      text: 'Turn off',
-    });
-  }
-
-  if (
-    optOutOptionsToUse.profileSync &&
-    !optOutOptionsToUse.basicFunctionality
-  ) {
-    await driver.clickElement(
-      '[data-testid="profile-sync-toggle"] .toggle-button',
-    );
-    await driver.clickElementAndWaitToDisappear({
-      tag: 'button',
-      text: 'Turn off',
-    });
-  }
-
-  await driver.clickElement('[data-testid="category-back-button"]');
-
-  if (optOutOptionsToUse.assets) {
-    // opt-out from third party API on assets section
-    await driver.clickElement({ text: 'Assets', tag: 'p' });
-    await Promise.all(
-      (
-        await driver.findClickableElements(
-          '.toggle-button.toggle-button--on:not([data-testid="basic-functionality-toggle"] .toggle-button)',
-        )
-      ).map((toggle) => toggle.click()),
-    );
-
-    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"]');
-
-  // complete onboarding
-  await driver.clickElementAndWaitToDisappear({
-    tag: 'button',
-    text: 'Done',
-  });
-  await onboardingPinExtension(driver);
-};
-
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * Completes the onboarding flow for creating a new wallet with opt-out options.
- *
- * This function guides the user through the onboarding process of creating a new wallet,
- * including opting out of certain features as specified by the `optOutOptions` parameter.
- * @param {object} driver - The Selenium driver instance.
- * @param {string} password - The password to use for the new wallet.
- * @param {object} optOutOptions - An object specifying the features to opt out of.
- * @param {boolean} optOutOptions.isNewWallet - Indicates if this is a new wallet creation.
- * @param {boolean} optOutOptions.basicFunctionality - Indicates if basic functionality should be opted out.
- * @param {boolean} optOutOptions.profileSync - Indicates if profile sync should be opted out.
- * @param {boolean} optOutOptions.assets - Indicates if assets should be opted out.
- */
-const completeCreateNewWalletOnboardingFlowWithOptOut = async (
-  driver,
-  password,
-  optOutOptions,
-) => {
-  await onboardingBeginCreateNewWallet(driver);
-  await onboardingChooseMetametricsOption(driver, false);
-  await onboardingCreatePassword(driver, password);
-  await onboardingRevealAndConfirmSRP(driver);
-  await onboardingCompleteWalletCreationWithOptOut(driver, optOutOptions);
-};
-
-/**
- * @deprecated Please use page object functions in `onboarding.flow.ts` and in `pages/onboarding/*`.
- * @param driver
- * @param password
- */
-const completeCreateNewWalletOnboardingFlow = async (driver, password) => {
-  await onboardingBeginCreateNewWallet(driver);
-  await onboardingChooseMetametricsOption(driver, false);
-  await onboardingCreatePassword(driver, password);
-  await onboardingRevealAndConfirmSRP(driver);
-  await onboardingCompleteWalletCreation(driver);
-  await onboardingPinExtension(driver);
-};
-
 const openSRPRevealQuiz = async (driver) => {
   // navigate settings to reveal SRP
   await driver.clickElement('[data-testid="account-options-menu-button"]');
@@ -864,22 +727,6 @@ const sendTransaction = async (
   }
 };
 
-const findAnotherAccountFromAccountList = async (
-  driver,
-  itemNumber,
-  accountName,
-) => {
-  await driver.clickElement('[data-testid="account-menu-icon"]');
-  const accountMenuItemSelector = `.multichain-account-list-item:nth-child(${itemNumber})`;
-
-  await driver.findElement({
-    css: `${accountMenuItemSelector} .multichain-account-list-item__account-name__button`,
-    text: accountName,
-  });
-
-  return accountMenuItemSelector;
-};
-
 const TEST_SEED_PHRASE =
   'forum vessel pink push lonely enact gentle tail admit parrot grunt dress';
 
@@ -1224,8 +1071,6 @@ module.exports = {
   largeDelayMs,
   veryLargeDelayMs,
   withFixtures,
-  completeCreateNewWalletOnboardingFlow,
-  completeCreateNewWalletOnboardingFlowWithOptOut,
   openSRPRevealQuiz,
   completeSRPRevealQuiz,
   tapAndHoldToRevealSRP,
@@ -1241,7 +1086,6 @@ module.exports = {
   multipleGanacheOptionsForType2Transactions,
   sendTransaction,
   sendScreenToConfirmScreen,
-  findAnotherAccountFromAccountList,
   unlockWallet,
   logInWithBalanceValidation,
   locateAccountBalanceDOM,
@@ -1260,7 +1104,6 @@ module.exports = {
   onboardingCreatePassword,
   onboardingRevealAndConfirmSRP,
   onboardingCompleteWalletCreation,
-  onboardingCompleteWalletCreationWithOptOut,
   onboardingPinExtension,
   assertInAnyOrder,
   genRandInitBal,
diff --git a/test/e2e/page-objects/flows/onboarding.flow.ts b/test/e2e/page-objects/flows/onboarding.flow.ts
index e235048b0a01..4af974bff9af 100644
--- a/test/e2e/page-objects/flows/onboarding.flow.ts
+++ b/test/e2e/page-objects/flows/onboarding.flow.ts
@@ -5,21 +5,31 @@ import OnboardingSrpPage from '../pages/onboarding/onboarding-srp-page';
 import StartOnboardingPage from '../pages/onboarding/start-onboarding-page';
 import SecureWalletPage from '../pages/onboarding/secure-wallet-page';
 import OnboardingCompletePage from '../pages/onboarding/onboarding-complete-page';
+import OnboardingPrivacySettingsPage from '../pages/onboarding/onboarding-privacy-settings-page';
 import { WALLET_PASSWORD } from '../../helpers';
 import { E2E_SRP } from '../../default-fixture';
 
 /**
  * Create new wallet onboarding flow
  *
- * @param driver - The WebDriver instance.
- * @param password - The password to create. Defaults to WALLET_PASSWORD.
+ * @param options - The options object.
+ * @param options.driver - The WebDriver instance.
+ * @param options.password - The password to create. Defaults to WALLET_PASSWORD.
+ * @param options.needNavigateToNewPage - Whether to navigate to a new page to start the onboarding flow. Defaults to true.
  */
-export const createNewWalletOnboardingFlow = async (
-  driver: Driver,
-  password: string = WALLET_PASSWORD,
-) => {
+export const createNewWalletOnboardingFlow = async ({
+  driver,
+  password = WALLET_PASSWORD,
+  needNavigateToNewPage = true,
+}: {
+  driver: Driver;
+  password?: string;
+  needNavigateToNewPage?: boolean;
+}): Promise<void> => {
   console.log('Starting the creation of a new wallet onboarding flow');
-  await driver.navigate();
+  if (needNavigateToNewPage) {
+    await driver.navigate();
+  }
   const startOnboardingPage = new StartOnboardingPage(driver);
   await startOnboardingPage.check_pageIsLoaded();
   await startOnboardingPage.checkTermsCheckbox();
@@ -95,7 +105,7 @@ export const completeCreateNewWalletOnboardingFlow = async (
   password: string = WALLET_PASSWORD,
 ) => {
   console.log('start to complete create new wallet onboarding flow ');
-  await createNewWalletOnboardingFlow(driver, password);
+  await createNewWalletOnboardingFlow({ driver, password });
   const onboardingCompletePage = new OnboardingCompletePage(driver);
   await onboardingCompletePage.check_pageIsLoaded();
   await onboardingCompletePage.check_congratulationsMessageIsDisplayed();
@@ -136,3 +146,50 @@ export const completeImportSRPOnboardingFlow = async ({
   await onboardingCompletePage.check_walletReadyMessageIsDisplayed();
   await onboardingCompletePage.completeOnboarding();
 };
+
+/**
+ * Complete create new wallet onboarding flow with custom privacy settings.
+ *
+ * @param options - The options object.
+ * @param options.driver - The WebDriver instance.
+ * @param options.password - The password to use. Defaults to WALLET_PASSWORD.
+ * @param options.needNavigateToNewPage - Whether to navigate to new page to start the onboarding flow. Defaults to true.
+ * @param options.toggleBasicFunctionality - Indicates if basic functionalities should be opted out. Defaults to true.
+ * @param options.toggleAssetsPrivacy - Indicates if assets privacy functionalities should be opted out. Defaults to true.
+ */
+export const completeCreateNewWalletOnboardingFlowWithCustomSettings = async ({
+  driver,
+  password = WALLET_PASSWORD,
+  needNavigateToNewPage = true,
+  toggleBasicFunctionality = true,
+  toggleAssetsPrivacy = true,
+}: {
+  driver: Driver;
+  password?: string;
+  needNavigateToNewPage?: boolean;
+  toggleBasicFunctionality?: boolean;
+  toggleAssetsPrivacy?: boolean;
+}): Promise<void> => {
+  await createNewWalletOnboardingFlow({
+    driver,
+    password,
+    needNavigateToNewPage,
+  });
+  const onboardingCompletePage = new OnboardingCompletePage(driver);
+  await onboardingCompletePage.check_pageIsLoaded();
+  await onboardingCompletePage.navigateToDefaultPrivacySettings();
+
+  const onboardingPrivacySettingsPage = new OnboardingPrivacySettingsPage(
+    driver,
+  );
+  if (toggleBasicFunctionality) {
+    await onboardingPrivacySettingsPage.toggleBasicFunctionalitySettings();
+  }
+  if (toggleAssetsPrivacy) {
+    await onboardingPrivacySettingsPage.toggleAssetsSettings();
+  }
+
+  await onboardingPrivacySettingsPage.navigateBackToOnboardingCompletePage();
+  await onboardingCompletePage.check_pageIsLoaded();
+  await onboardingCompletePage.completeOnboarding();
+};
diff --git a/test/e2e/page-objects/pages/settings/privacy-settings.ts b/test/e2e/page-objects/pages/settings/privacy-settings.ts
index ab0486d2003e..8fc0645f77e9 100644
--- a/test/e2e/page-objects/pages/settings/privacy-settings.ts
+++ b/test/e2e/page-objects/pages/settings/privacy-settings.ts
@@ -110,9 +110,11 @@ class PrivacySettings {
   /**
    * Complete reveal SRP quiz to open reveal SRP dialog.
    *
-   * @param checkErrorAnswer - Whether to check for error answers during answering the quiz.
+   * @param checkErrorAnswer - Whether to check for error answers during answering the quiz. Defaults to false.
    */
-  async completeRevealSrpQuiz(checkErrorAnswer?: boolean): Promise<void> {
+  async completeRevealSrpQuiz(
+    checkErrorAnswer: boolean = false,
+  ): Promise<void> {
     console.log('Complete reveal SRP quiz on privacy settings page');
     await this.driver.clickElement(this.revealSrpQuizGetStartedButton);
 
@@ -169,6 +171,12 @@ class PrivacySettings {
     }
   }
 
+  async getSrpInRevealSrpDialog(): Promise<string> {
+    console.log('Get SRP in reveal SRP dialog on privacy settings page');
+    await this.driver.waitForSelector(this.displayedSrpText);
+    return (await this.driver.findElement(this.displayedSrpText)).getText();
+  }
+
   async openRevealSrpQuiz(): Promise<void> {
     console.log('Open reveal SRP quiz on privacy settings page');
     await this.driver.clickElement(this.revealSrpButton);
diff --git a/test/e2e/page-objects/pages/vault-decryptor-page.ts b/test/e2e/page-objects/pages/vault-decryptor-page.ts
new file mode 100644
index 000000000000..0d04d231dcfe
--- /dev/null
+++ b/test/e2e/page-objects/pages/vault-decryptor-page.ts
@@ -0,0 +1,96 @@
+import { Driver } from '../../webdriver/driver';
+import { WALLET_PASSWORD } from '../../helpers';
+
+class VaultDecryptorPage {
+  private driver: Driver;
+
+  private readonly decryptButton = {
+    text: 'Decrypt',
+    tag: 'button',
+  };
+
+  private readonly fileInput = '#fileinput';
+
+  private readonly passwordInput = '#passwordinput';
+
+  private readonly radioFileInput = '#radio-fileinput';
+
+  private readonly radioTextInput = '#radio-textinput';
+
+  private readonly textInput = '#textinput';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.fileInput,
+        this.textInput,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Vault Decryptor page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Vault Decryptor page is loaded');
+  }
+
+  /**
+   * Confirm the decryption process on the Vault Decryptor page.
+   */
+  async confirmDecrypt() {
+    console.log('click to confirm decrypt on vault decryptor page');
+    await this.driver.clickElement(this.decryptButton);
+  }
+
+  /**
+   * Fill the password input field with the specified password.
+   *
+   * @param password - The password to fill in the password input field. Defaults to WALLET_PASSWORD.
+   */
+  async fillPassword(password: string = WALLET_PASSWORD) {
+    await this.driver.fill(this.passwordInput, password);
+  }
+
+  /**
+   * Fill the text input field with the specified vault text.
+   *
+   * @param vaultText - The text to fill in the text input field.
+   */
+  async fillVaultText(vaultText: string) {
+    console.log('fill vault text on vault decryptor page');
+    await this.driver.clickElement(this.radioTextInput);
+    await this.driver.fill(this.textInput, vaultText);
+  }
+
+  /**
+   * Uploads a log file to the Vault Decryptor page.
+   *
+   * @param filePath - The path to the log file to upload.
+   */
+  async uploadLogFile(filePath: string) {
+    console.log('upload log file on vault decryptor page');
+    await this.driver.clickElement(this.radioFileInput);
+    const inputField = await this.driver.findElement(this.fileInput);
+    await inputField.sendKeys(filePath);
+  }
+
+  /**
+   * Checks if the vault is decrypted and the seed phrase is correct.
+   *
+   * @param seedPhrase - The expected seed phrase.
+   */
+  async check_vaultIsDecrypted(seedPhrase: string) {
+    console.log('check vault is decrypted on vault decryptor page');
+    await this.driver.waitForSelector({
+      text: seedPhrase,
+      tag: 'div',
+    });
+  }
+}
+
+export default VaultDecryptorPage;
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 f9574a27cb10..36776b367730 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
@@ -102,10 +102,10 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
           },
         },
         async ({ driver }) => {
-          await createNewWalletOnboardingFlow(
+          await createNewWalletOnboardingFlow({
             driver,
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+            password: NOTIFICATIONS_TEAM_PASSWORD,
+          });
           const onboardingCompletePage = new OnboardingCompletePage(driver);
           await onboardingCompletePage.check_pageIsLoaded();
           await onboardingCompletePage.navigateToDefaultPrivacySettings();
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 1644cb068a3a..f1bdc08166b7 100644
--- a/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
+++ b/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
@@ -90,7 +90,7 @@ describe('MetaMask onboarding @no-mmi', function () {
         testSpecificMock: mockInfura,
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await createNewWalletOnboardingFlow(driver);
+        await createNewWalletOnboardingFlow({ driver });
 
         // Check no requests are made before completing creat new wallet onboarding
         // Intended delay to ensure we cover at least 1 polling loop of time for the network request
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 35ff25344789..6ee57ae02490 100644
--- a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
+++ b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
@@ -29,7 +29,7 @@ describe('Reveal SRP through settings', function () {
         const privacySettings = new PrivacySettings(driver);
         await privacySettings.check_pageIsLoaded();
         await privacySettings.openRevealSrpQuiz();
-        await privacySettings.completeRevealSrpQuiz(true);
+        await privacySettings.completeRevealSrpQuiz();
         await privacySettings.fillPasswordToRevealSrp(
           wrongTestPassword,
           'Incorrect password',
@@ -58,7 +58,7 @@ describe('Reveal SRP through settings', function () {
 
         // fill password to reveal SRP and check the displayed SRP
         await privacySettings.openRevealSrpQuiz();
-        await privacySettings.completeRevealSrpQuiz(true);
+        await privacySettings.completeRevealSrpQuiz();
         await privacySettings.fillPasswordToRevealSrp(testPassword);
         await privacySettings.check_srpTextIsDisplayed(E2E_SRP);
         await privacySettings.check_displayedSrpCanBeCopied();
diff --git a/test/e2e/vault-decryption-chrome.spec.js b/test/e2e/vault-decryption-chrome.spec.js
deleted file mode 100644
index aa2b223dce56..000000000000
--- a/test/e2e/vault-decryption-chrome.spec.js
+++ /dev/null
@@ -1,293 +0,0 @@
-const { strict: assert } = require('assert');
-const os = require('os');
-const path = require('path');
-const fs = require('fs-extra');
-const level = require('level');
-const {
-  withFixtures,
-  WALLET_PASSWORD,
-  openSRPRevealQuiz,
-  completeSRPRevealQuiz,
-  tapAndHoldToRevealSRP,
-  completeCreateNewWalletOnboardingFlowWithOptOut,
-} = require('./helpers');
-
-const VAULT_DECRYPTOR_PAGE = 'https://metamask.github.io/vault-decryptor';
-
-/**
- * Copies a directory to a temporary location.
- *
- * @param {string} srcDir - The source directory to copy.
- * @returns {Promise<string>} The path to the copied directory in the temporary location.
- */
-async function copyDirectoryToTmp(srcDir) {
-  try {
-    // Get a temporary directory
-    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'temp'));
-
-    // Define the destination path in the temporary directory
-    const destDir = path.join(tmpDir, path.basename(srcDir));
-
-    // Copy the directory
-    await fs.copy(srcDir, destDir);
-    console.log(`Directory copied to: ${destDir}`);
-    return destDir;
-  } catch (err) {
-    console.error('Error copying directory:', err);
-    return null;
-  }
-}
-
-/**
- * Retrieve the extension's storage file path.
- *
- * Note that this folder is usually unavailable when running e2e tests
- * on a test build, as test builds do not use the real browser storage.
- *
- * @param {WebDriver} driver
- * @returns {Promise<string>} The extension storage path.
- */
-async function getExtensionStorageFilePath(driver) {
-  const { userDataDir } = (await driver.driver.getCapabilities()).get('chrome');
-  const extensionsStoragePath = path.resolve(
-    userDataDir,
-    'Default',
-    'Local Extension Settings',
-  );
-  // we expect the extension to have been installed only once
-  const extensionName = fs.readdirSync(extensionsStoragePath)[0];
-  const extensionStoragePath = path.resolve(
-    extensionsStoragePath,
-    extensionName,
-  );
-
-  return extensionStoragePath;
-}
-
-/**
- * Retrieve the log file from the extension's storage path.
- *
- * @param {string} extensionStoragePath - The path to the extension's storage.
- * @returns {string} The log file path.
- */
-function getExtensionLogFile(extensionStoragePath) {
-  const logFiles = fs
-    .readdirSync(extensionStoragePath)
-    .filter((filename) => filename.endsWith('.log'));
-
-  // Use the first of the `.log` files found
-  return path.resolve(extensionStoragePath, logFiles[0]);
-}
-
-/**
- * Gets the size of a file in bytes.
- *
- * @param {string} filePath - The path to the file.
- * @returns {Promise<number>} A promise that resolves to the size of the file in bytes.
- */
-async function getFileSize(filePath) {
-  const stats = await fs.promises.stat(filePath);
-  console.log(`File Size =========================: ${stats.size} bytes`);
-  return stats.size;
-}
-
-/**
- * Retry logic to ensure Chrome has finish writing into the file.
- *
- * @param {object} options - The options object.
- * @param {WebDriver} options.driver - The WebDriver instance.
- * @param {string} options.filePath - The path to the file.
- * @param {number} options.maxRetries - The maximum number of retries.
- * @param {number} options.minFileSize - The minimum file size in bytes.
- * @returns {Promise<void>}
- */
-async function waitUntilFileIsWritten({
-  driver,
-  filePath,
-  maxRetries = 3,
-  minFileSize = 1000000,
-}) {
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    const fileSize = await getFileSize(filePath);
-    if (fileSize > minFileSize) {
-      break;
-    } else {
-      console.log(`File size is too small (${fileSize} bytes)`);
-      if (attempt < maxRetries - 1) {
-        console.log(`Waiting for 2 seconds before retrying...`);
-        await driver.delay(2000);
-      }
-    }
-  }
-}
-
-/**
- * Closes the announcements popover if present
- *
- * @param {WebDriver} driver
- */
-async function closePopoverIfPresent(driver) {
-  const popoverButtonSelector = '[data-testid="popover-close"]';
-  // It shows in the Smart Transactions Opt-In Modal.
-  const enableButtonSelector = {
-    text: 'Enable',
-    tag: 'button',
-  };
-  await driver.clickElementSafe(popoverButtonSelector);
-  await driver.clickElementSafe(enableButtonSelector);
-
-  // Token Autodetection Independent Announcement
-  const tokenAutodetection = {
-    css: '[data-testid="auto-detect-token-modal"] button',
-    text: 'Not right now',
-  };
-  await driver.clickElementSafe(tokenAutodetection);
-
-  // NFT Autodetection Independent Announcement
-  const nftAutodetection = {
-    css: '[data-testid="auto-detect-nft-modal"] button',
-    text: 'Not right now',
-  };
-  await driver.clickElementSafe(nftAutodetection);
-}
-
-/**
- * Obtain the SRP from the settings
- *
- * @param {WebDriver} driver
- * @returns {Promise<string>} The SRP
- */
-async function getSRP(driver) {
-  await openSRPRevealQuiz(driver);
-  await completeSRPRevealQuiz(driver);
-  await driver.fill('[data-testid="input-password"]', WALLET_PASSWORD);
-  await driver.press('[data-testid="input-password"]', driver.Key.ENTER);
-  await tapAndHoldToRevealSRP(driver);
-  return (await driver.findElement('[data-testid="srp_text"]')).getText();
-}
-
-describe('Vault Decryptor Page', function () {
-  it('is able to decrypt the vault uploading the log file in the vault-decryptor webapp', async function () {
-    await withFixtures(
-      {
-        disableServerMochaToBackground: true,
-      },
-      async ({ driver }) => {
-        // we don't need to use navigate
-        // since MM will automatically open a new window in prod build
-        await driver.waitUntilXWindowHandles(2);
-
-        // we cannot use the customized driver functions
-        // as there is no socket for window communications in prod builds
-        const windowHandles = await driver.driver.getAllWindowHandles();
-
-        // switch to MetaMask window
-        await driver.driver.switchTo().window(windowHandles[2]);
-
-        // create a new vault through onboarding flow
-        await completeCreateNewWalletOnboardingFlowWithOptOut(
-          driver,
-          WALLET_PASSWORD,
-        );
-        // close popover if any (Announcements etc..)
-        await closePopoverIfPresent(driver);
-        // obtain SRP
-        const seedPhrase = await getSRP(driver);
-
-        // navigate to the Vault decryptor webapp
-        await driver.openNewPage(VAULT_DECRYPTOR_PAGE);
-        // fill the input field with storage recovered from filesystem
-        await driver.clickElement('[name="vault-source"]');
-        const inputField = await driver.findElement('#fileinput');
-
-        // Retry-logic to ensure the file is ready before uploading it
-        // to mitigate flakiness when Chrome hasn't finished writing
-        const extensionPath = await getExtensionStorageFilePath(driver);
-        const extensionLogFile = getExtensionLogFile(extensionPath);
-        await waitUntilFileIsWritten({ driver, filePath: extensionLogFile });
-
-        await inputField.press(extensionLogFile);
-
-        // fill in the password
-        await driver.fill('#passwordinput', WALLET_PASSWORD);
-        // decrypt
-        await driver.clickElement('.decrypt');
-        const decrypted = await driver.findElement('.content div div div');
-        const recoveredVault = JSON.parse(await decrypted.getText());
-
-        assert.equal(recoveredVault[0].data.mnemonic, seedPhrase);
-      },
-    );
-  });
-  it('is able to decrypt the vault pasting the text in the vault-decryptor webapp', async function () {
-    await withFixtures(
-      {
-        disableServerMochaToBackground: true,
-      },
-      async ({ driver }) => {
-        // we don't need to use navigate
-        // since MM will automatically open a new window in prod build
-        await driver.waitUntilXWindowHandles(2);
-
-        // we cannot use the customized driver functions
-        // as there is no socket for window communications in prod builds
-        const windowHandles = await driver.driver.getAllWindowHandles();
-
-        // switch to MetaMask window
-        await driver.driver.switchTo().window(windowHandles[2]);
-
-        // create a new vault through onboarding flow
-        await completeCreateNewWalletOnboardingFlowWithOptOut(
-          driver,
-          WALLET_PASSWORD,
-        );
-        // close popover if any (Announcements etc..)
-        await closePopoverIfPresent(driver);
-        // obtain SRP
-        const seedPhrase = await getSRP(driver);
-
-        // navigate to the Vault decryptor webapp
-        await driver.openNewPage(VAULT_DECRYPTOR_PAGE);
-
-        // retry-logic to ensure the file is written before copying it
-        const extensionPath = await getExtensionStorageFilePath(driver);
-        const extensionLogFile = getExtensionLogFile(extensionPath);
-        await waitUntilFileIsWritten({ driver, filePath: extensionLogFile });
-
-        // copy log file to a temp location, to avoid reading it while the browser is writting it
-        let newDir;
-        let vaultObj;
-        let db;
-        try {
-          newDir = await copyDirectoryToTmp(extensionPath);
-          db = new level.Level(newDir, { valueEncoding: 'json' });
-          await db.open();
-          const {
-            KeyringController: { vault },
-          } = await db.get('data');
-          vaultObj = JSON.parse(vault);
-        } finally {
-          if (db) {
-            await db.close();
-          }
-          if (newDir) {
-            await fs.remove(newDir);
-          }
-        }
-
-        await driver.clickElement('#radio-textinput');
-        await driver.fill('#textinput', JSON.stringify(vaultObj));
-
-        // fill in the password
-        await driver.fill('#passwordinput', WALLET_PASSWORD);
-
-        // decrypt
-        await driver.clickElement('.decrypt');
-        const decrypted = await driver.findElement('.content div div div');
-        const recoveredVault = JSON.parse(await decrypted.getText());
-
-        assert.equal(recoveredVault[0].data.mnemonic, seedPhrase);
-      },
-    );
-  });
-});
diff --git a/test/e2e/vault-decryption-chrome.spec.ts b/test/e2e/vault-decryption-chrome.spec.ts
new file mode 100644
index 000000000000..f66ee7d10839
--- /dev/null
+++ b/test/e2e/vault-decryption-chrome.spec.ts
@@ -0,0 +1,298 @@
+import os from 'os';
+import path from 'path';
+import fs from 'fs-extra';
+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 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';
+import { completeCreateNewWalletOnboardingFlowWithCustomSettings } from './page-objects/flows/onboarding.flow';
+
+const VAULT_DECRYPTOR_PAGE = 'https://metamask.github.io/vault-decryptor';
+
+/**
+ * Copies a directory to a temporary location.
+ *
+ * @param srcDir - The source directory to copy.
+ * @returns The path to the copied directory in the temporary location.
+ */
+async function copyDirectoryToTmp(srcDir: string): Promise<string> {
+  try {
+    // Get a temporary directory
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'temp'));
+
+    // Define the destination path in the temporary directory
+    const destDir = path.join(tmpDir, path.basename(srcDir));
+
+    // Copy the directory
+    await fs.copy(srcDir, destDir);
+    console.log(`Directory copied to: ${destDir}`);
+    return destDir;
+  } catch (err) {
+    console.error('Error copying directory:', err);
+    return '';
+  }
+}
+
+/**
+ * Retrieve the extension's storage file path.
+ *
+ * Note that this folder is usually unavailable when running e2e tests
+ * on a test build, as test builds do not use the real browser storage.
+ *
+ * @param driver
+ * @returns The extension storage path.
+ */
+async function getExtensionStorageFilePath(driver: Driver): Promise<string> {
+  const { userDataDir } = (await driver.driver.getCapabilities()).get('chrome');
+  const extensionsStoragePath = path.resolve(
+    userDataDir,
+    'Default',
+    'Local Extension Settings',
+  );
+  // we expect the extension to have been installed only once
+  const extensionName = fs.readdirSync(extensionsStoragePath)[0];
+  const extensionStoragePath = path.resolve(
+    extensionsStoragePath,
+    extensionName,
+  );
+
+  return extensionStoragePath;
+}
+
+/**
+ * Retrieve the log file from the extension's storage path.
+ *
+ * @param extensionStoragePath - The path to the extension's storage.
+ * @returns The log file path.
+ */
+function getExtensionLogFile(extensionStoragePath: string): string {
+  const logFiles = fs
+    .readdirSync(extensionStoragePath)
+    .filter((filename: string) => filename.endsWith('.log'));
+
+  // Use the first of the `.log` files found
+  return path.resolve(extensionStoragePath, logFiles[0]);
+}
+
+/**
+ * Gets the size of a file in bytes.
+ *
+ * @param filePath - The path to the file.
+ * @returns A promise that resolves to the size of the file in bytes.
+ */
+async function getFileSize(filePath: string): Promise<number> {
+  const stats = await fs.promises.stat(filePath);
+  console.log(`File Size =========================: ${stats.size} bytes`);
+  return stats.size;
+}
+
+/**
+ * Retry logic to ensure Chrome has finish writing into the file.
+ *
+ * @param options - The options object.
+ * @param options.driver - The WebDriver instance.
+ * @param options.filePath - The path to the file.
+ * @param options.maxRetries - The maximum number of retries.
+ * @param options.minFileSize - The minimum file size in bytes.
+ * @returns
+ */
+async function waitUntilFileIsWritten({
+  driver,
+  filePath,
+  maxRetries = 3,
+  minFileSize = 1000000,
+}: {
+  driver: Driver;
+  filePath: string;
+  maxRetries?: number;
+  minFileSize?: number;
+}): Promise<void> {
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    const fileSize = await getFileSize(filePath);
+    if (fileSize > minFileSize) {
+      break;
+    } else {
+      console.log(`File size is too small (${fileSize} bytes)`);
+      if (attempt < maxRetries - 1) {
+        console.log(`Waiting for 2 seconds before retrying...`);
+        await driver.delay(2000);
+      }
+    }
+  }
+}
+
+/**
+ * Closes the announcements popover if present
+ *
+ * @param driver
+ */
+async function closePopoverIfPresent(driver: Driver) {
+  const popoverButtonSelector = '[data-testid="popover-close"]';
+  // It shows in the Smart Transactions Opt-In Modal.
+  const enableButtonSelector = {
+    text: 'Enable',
+    tag: 'button',
+  };
+  await driver.clickElementSafe(popoverButtonSelector);
+  await driver.clickElementSafe(enableButtonSelector);
+
+  // Token Autodetection Independent Announcement
+  const tokenAutodetection = {
+    css: '[data-testid="auto-detect-token-modal"] button',
+    text: 'Not right now',
+  };
+  await driver.clickElementSafe(tokenAutodetection);
+
+  // NFT Autodetection Independent Announcement
+  const nftAutodetection = {
+    css: '[data-testid="auto-detect-nft-modal"] button',
+    text: 'Not right now',
+  };
+  await driver.clickElementSafe(nftAutodetection);
+}
+
+describe('Vault Decryptor Page', function () {
+  it('is able to decrypt the vault uploading the log file in the vault-decryptor webapp', async function () {
+    await withFixtures(
+      {
+        disableServerMochaToBackground: true,
+      },
+      async ({ driver }) => {
+        // we don't need to use navigate since MM will automatically open a new window in prod build
+        await driver.waitUntilXWindowHandles(2);
+
+        // we cannot use the customized driver functionsas there is no socket for window communications in prod builds
+        const windowHandles = await driver.driver.getAllWindowHandles();
+
+        // switch to MetaMask window and create a new vault through onboarding flow
+        await driver.driver.switchTo().window(windowHandles[2]);
+        await completeCreateNewWalletOnboardingFlowWithCustomSettings({
+          driver,
+          password: WALLET_PASSWORD,
+          needNavigateToNewPage: false,
+        });
+        // close popover if any (Announcements etc..)
+        await closePopoverIfPresent(driver);
+
+        // go to privacy settings page
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        // fill password to reveal SRP and get the SRP
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+        await privacySettings.openRevealSrpQuiz();
+        await privacySettings.completeRevealSrpQuiz();
+        await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
+        const seedPhrase = await privacySettings.getSrpInRevealSrpDialog();
+
+        // Retry-logic to ensure the file is ready before uploading itto mitigate flakiness when Chrome hasn't finished writing
+        const extensionPath = await getExtensionStorageFilePath(driver);
+        const extensionLogFile = getExtensionLogFile(extensionPath);
+        await waitUntilFileIsWritten({ driver, filePath: extensionLogFile });
+
+        // navigate to the Vault decryptor webapp and fill the input field with storage recovered from filesystem
+        await driver.openNewPage(VAULT_DECRYPTOR_PAGE);
+        const vaultDecryptorPage = new VaultDecryptorPage(driver);
+        await vaultDecryptorPage.check_pageIsLoaded();
+        await vaultDecryptorPage.uploadLogFile(extensionLogFile);
+
+        // fill the password and decrypt
+        await vaultDecryptorPage.fillPassword();
+        await vaultDecryptorPage.confirmDecrypt();
+        await vaultDecryptorPage.check_vaultIsDecrypted(seedPhrase);
+      },
+    );
+  });
+
+  it('is able to decrypt the vault pasting the text in the vault-decryptor webapp', async function () {
+    await withFixtures(
+      {
+        disableServerMochaToBackground: true,
+      },
+      async ({ driver }) => {
+        // we don't need to use navigate since MM will automatically open a new window in prod build
+        await driver.waitUntilXWindowHandles(2);
+
+        // we cannot use the customized driver functions as there is no socket for window communications in prod builds
+        const windowHandles = await driver.driver.getAllWindowHandles();
+
+        // switch to MetaMask window and create a new vault through onboarding flow
+        await driver.driver.switchTo().window(windowHandles[2]);
+        await completeCreateNewWalletOnboardingFlowWithCustomSettings({
+          driver,
+          password: WALLET_PASSWORD,
+          needNavigateToNewPage: false,
+        });
+        // close popover if any (Announcements etc..)
+        await closePopoverIfPresent(driver);
+
+        // go to privacy settings page
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToPrivacySettings();
+
+        // fill password to reveal SRP and get the SRP
+        const privacySettings = new PrivacySettings(driver);
+        await privacySettings.check_pageIsLoaded();
+        await privacySettings.openRevealSrpQuiz();
+        await privacySettings.completeRevealSrpQuiz();
+        await privacySettings.fillPasswordToRevealSrp(WALLET_PASSWORD);
+        const seedPhrase = await privacySettings.getSrpInRevealSrpDialog();
+
+        // retry-logic to ensure the file is written before copying it
+        const extensionPath = await getExtensionStorageFilePath(driver);
+        const extensionLogFile = getExtensionLogFile(extensionPath);
+        await waitUntilFileIsWritten({ driver, filePath: extensionLogFile });
+
+        // copy log file to a temp location, to avoid reading it while the browser is writting it
+        type VaultData = {
+          KeyringController: {
+            vault: string;
+          };
+        };
+        let newDir;
+        let vaultObj;
+        let db;
+        try {
+          newDir = await copyDirectoryToTmp(extensionPath);
+          db = new level.Level(newDir, { valueEncoding: 'json' });
+          await db.open();
+          const data = (await db.get('data')) as unknown as VaultData;
+          vaultObj = JSON.parse(data.KeyringController.vault);
+        } finally {
+          if (db) {
+            await db.close();
+          }
+          if (newDir) {
+            await fs.remove(newDir);
+          }
+        }
+
+        // navigate to the Vault decryptor webapp and fill the text input field with the vault text
+        await driver.openNewPage(VAULT_DECRYPTOR_PAGE);
+        const vaultDecryptorPage = new VaultDecryptorPage(driver);
+        await vaultDecryptorPage.check_pageIsLoaded();
+        await vaultDecryptorPage.fillVaultText(JSON.stringify(vaultObj));
+
+        // fill the password and decrypt
+        await vaultDecryptorPage.fillPassword();
+        await vaultDecryptorPage.confirmDecrypt();
+        await vaultDecryptorPage.check_vaultIsDecrypted(seedPhrase);
+      },
+    );
+  });
+});

From 010b560de03e66c421815d492bd4de22dfd82006 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 15 Nov 2024 18:56:34 +0530
Subject: [PATCH 099/111] chore: Fix flaky ERC20 transfer blockaid e2e (#28453)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

It appears that ERC20 transfer option on test dapp is broken which is
causing the test to be flaky. The PR skips the test till we fix test
dapp.

## **Related issues**

Ref: https://github.com/MetaMask/metamask-extension/issues/28434

## **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/ppom/ppom-blockaid-alert-erc20-transfer.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
index 4f6fcf819f94..506bec00fa00 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
@@ -59,7 +59,8 @@ async function mockInfuraWithMaliciousResponses(mockServer) {
   await mockRequest(mockServer, maliciousTransferAlert);
 }
 
-describe('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
+// eslint-disable-next-line mocha/no-skipped-tests
+describe.skip('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
   it('should show banner alert', async function () {
     // we need to use localhost instead of the ip
     // see issue: https://github.com/MetaMask/MetaMask-planning/issues/3560

From 4d5940ec6368afc648db2d8859c6e8586ec589e1 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:08:07 +0100
Subject: [PATCH 100/111] chore: fix test path on CI (#28482)
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 test path on CI since we have migrated test to TS

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28482?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/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 03cb5091da4e..70268a812421 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1195,7 +1195,7 @@ jobs:
           at: .
       - run:
           name: test:e2e:single
-          command: .circleci/scripts/test-run-e2e.sh yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.js --browser chrome
+          command: .circleci/scripts/test-run-e2e.sh yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.ts --browser chrome
           no_output_timeout: 5m
       - store_artifacts:
           path: test-artifacts

From dbe5947b380226a93d84fd8e64bc9d5f3f15ed0b Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:48:14 +0000
Subject: [PATCH 101/111] fix: Fix race condition validating ERC20 transfer
 (blockaid) (#28487)
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**
Fixed race condition when validating ERC20 transfer and enabled ERC20
transfer blockaid e2e.

<!--
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/28487?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Go to this the test dapp
2. Click and reject (fast ) all types of requests in the section: PPOM -
Malicious Transactions and Signatures
3. Should not get stuck in the loader

## **Screenshots/Recordings**

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

### **Before**

[all PPOM
signatures.webm](https://github.com/user-attachments/assets/b59a965a-f5e9-44e6-93a5-9058cd164933)

<!-- [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/security-alerts-api.ts                    | 2 +-
 app/scripts/metamask-controller.js                             | 2 +-
 test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/scripts/lib/ppom/security-alerts-api.ts b/app/scripts/lib/ppom/security-alerts-api.ts
index 258526f1b7c4..d0b6bc812b1a 100644
--- a/app/scripts/lib/ppom/security-alerts-api.ts
+++ b/app/scripts/lib/ppom/security-alerts-api.ts
@@ -51,7 +51,7 @@ async function request(endpoint: string, options?: RequestInit) {
     );
   }
 
-  return response.json();
+  return await response.json();
 }
 
 function getUrl(endpoint: string) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2f8a3a1fe807..7aa3dfc87b92 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -5161,7 +5161,7 @@ export default class MetamaskController extends EventEmitter {
     securityAlertId,
     securityAlertResponse,
   ) {
-    updateSecurityAlertResponse({
+    await updateSecurityAlertResponse({
       appStateController: this.appStateController,
       method,
       securityAlertId,
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
index 506bec00fa00..4f6fcf819f94 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js
@@ -59,8 +59,7 @@ async function mockInfuraWithMaliciousResponses(mockServer) {
   await mockRequest(mockServer, maliciousTransferAlert);
 }
 
-// eslint-disable-next-line mocha/no-skipped-tests
-describe.skip('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
+describe('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
   it('should show banner alert', async function () {
     // we need to use localhost instead of the ip
     // see issue: https://github.com/MetaMask/MetaMask-planning/issues/3560

From 17004224bffc25611cce88d83a3391ff99c83b48 Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Sat, 16 Nov 2024 01:14:54 +0800
Subject: [PATCH 102/111] fix: display btc account creation while in settings
 (#28379)
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 resolves the issue where the account creation is now displayed
if the user tries to create a BTC account while in the settings page.

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/642

## **Manual testing steps**

1. Go to settings and check `Enable "Add a new Bitcoin account (Beta)"`
in the experimental settings.
2. Open the account menu
3. Create a btc account

## **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**

- [ ] 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-list-menu.test.tsx                | 69 +++++++++++++++++--
 .../account-list-menu/account-list-menu.tsx   | 41 +++++++----
 2 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
index 7a849577dfa4..539899d0eb09 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx
@@ -7,27 +7,32 @@ import {
   KeyringAccountType,
 } from '@metamask/keyring-api';
 import { merge } from 'lodash';
-import { fireEvent, renderWithProvider, waitFor } from '../../../../test/jest';
+import { fireEvent, waitFor } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import messages from '../../../../app/_locales/en/messages.json';
-import { CONNECT_HARDWARE_ROUTE } from '../../../helpers/constants/routes';
+import {
+  CONFIRMATION_V_NEXT_ROUTE,
+  CONNECT_HARDWARE_ROUTE,
+} from '../../../helpers/constants/routes';
 ///: END:ONLY_INCLUDE_IF
 import { ETH_EOA_METHODS } from '../../../../shared/constants/eth-methods';
 import { createMockInternalAccount } from '../../../../test/jest/mocks';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { AccountListMenu } from '.';
 
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 const mockOnClose = jest.fn();
 const mockGetEnvironmentType = jest.fn();
 const mockNextAccountName = jest.fn().mockReturnValue('Test Account 2');
+const mockBitcoinClientCreateAccount = jest.fn();
 
 jest.mock('../../../../app/scripts/lib/util', () => ({
   ...jest.requireActual('../../../../app/scripts/lib/util'),
-  getEnvironmentType: () => mockGetEnvironmentType,
+  getEnvironmentType: () => () => mockGetEnvironmentType(),
 }));
 ///: END:ONLY_INCLUDE_IF
 
@@ -43,6 +48,15 @@ jest.mock('react-router-dom', () => ({
   useHistory: jest.fn(() => []),
 }));
 
+jest.mock('../../../hooks/accounts/useMultichainWalletSnapClient', () => ({
+  ...jest.requireActual(
+    '../../../hooks/accounts/useMultichainWalletSnapClient',
+  ),
+  useMultichainWalletSnapClient: () => ({
+    createAccount: mockBitcoinClientCreateAccount,
+  }),
+}));
+
 const render = (
   state = {},
   props: {
@@ -52,6 +66,7 @@ const render = (
     onClose: () => jest.fn(),
     allowedAccountTypes: [EthAccountType.Eoa, EthAccountType.Erc4337],
   },
+  location: string = '/',
 ) => {
   const defaultState = {
     ...mockState,
@@ -82,6 +97,7 @@ const render = (
           },
         },
       },
+      bitcoinSupportEnabled: true,
     },
     activeTab: {
       id: 113,
@@ -95,7 +111,7 @@ const render = (
     },
   };
   const store = configureStore(merge(defaultState, state));
-  return renderWithProvider(<AccountListMenu {...props} />, store);
+  return renderWithProvider(<AccountListMenu {...props} />, store, location);
 };
 
 describe('AccountListMenu', () => {
@@ -512,6 +528,51 @@ describe('AccountListMenu', () => {
   });
   ///: END:ONLY_INCLUDE_IF
 
+  describe('BTC account creation', () => {
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+
+    it('calls the bitcoin client to create an account', async () => {
+      const { getByText, getByTestId } = render();
+
+      const button = getByTestId(
+        'multichain-account-menu-popover-action-button',
+      );
+      button.click();
+
+      const createBtcAccountButton = getByText(
+        messages.addNewBitcoinAccount.message,
+      );
+
+      createBtcAccountButton.click();
+
+      expect(mockBitcoinClientCreateAccount).toHaveBeenCalled();
+    });
+
+    it('redirects the user to the approval after clicking create account in the settings page', async () => {
+      const { getByText, getByTestId } = render(
+        undefined,
+        undefined,
+        '/settings',
+      );
+
+      const button = getByTestId(
+        'multichain-account-menu-popover-action-button',
+      );
+      button.click();
+
+      const createBtcAccountButton = getByText(
+        messages.addNewBitcoinAccount.message,
+      );
+
+      createBtcAccountButton.click();
+
+      expect(historyPushMock).toHaveBeenCalledWith(CONFIRMATION_V_NEXT_ROUTE);
+      expect(mockBitcoinClientCreateAccount).toHaveBeenCalled();
+    });
+  });
+
   describe('prop `allowedAccountTypes`', () => {
     const mockAccount = createMockInternalAccount();
     const mockBtcAccount = createMockInternalAccount({
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 d649934ee75d..29d79e8537b1 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -6,7 +6,12 @@ import React, {
   useEffect,
 } from 'react';
 import PropTypes from 'prop-types';
-import { useHistory } from 'react-router-dom';
+import {
+  useHistory,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  useLocation,
+  ///: END:ONLY_INCLUDE_IF
+} from 'react-router-dom';
 import Fuse from 'fuse.js';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -81,6 +86,10 @@ import {
 } from '../../../../shared/constants/metametrics';
 import {
   CONNECT_HARDWARE_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  CONFIRMATION_V_NEXT_ROUTE,
+  SETTINGS_ROUTE,
+  ///: END:ONLY_INCLUDE_IF
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   CUSTODY_ACCOUNT_ROUTE,
   ///: END:ONLY_INCLUDE_IF
@@ -247,6 +256,9 @@ export const AccountListMenu = ({
   const currentTabOrigin = useSelector(getOriginOfCurrentTab);
   const history = useHistory();
   const dispatch = useDispatch();
+  ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  const { pathname } = useLocation();
+  ///: END:ONLY_INCLUDE_IF
   const hiddenAddresses = useSelector(getHiddenAccountsList);
   const updatedAccountsList = useSelector(getUpdatedAndSortedAccounts);
   const filteredUpdatedAccountList = useMemo(
@@ -295,6 +307,17 @@ export const AccountListMenu = ({
   const bitcoinWalletSnapClient = useMultichainWalletSnapClient(
     WalletClientType.Bitcoin,
   );
+  const handleAccountCreation = async (network: MultichainNetworks) => {
+    // The account creation + renaming is handled by the Snap account bridge, so
+    // we need to close the current modal
+    onClose();
+    if (pathname.includes(SETTINGS_ROUTE)) {
+      // The settings route does not redirect pending confirmations. We need to redirect manually here.
+      history.push(CONFIRMATION_V_NEXT_ROUTE);
+    }
+
+    await bitcoinWalletSnapClient.createAccount(network);
+  };
   ///: END:ONLY_INCLUDE_IF
 
   ///: BEGIN:ONLY_INCLUDE_IF(solana)
@@ -302,6 +325,7 @@ export const AccountListMenu = ({
   const solanaWalletSnapClient = useMultichainWalletSnapClient(
     WalletClientType.Solana,
   );
+
   ///: END:ONLY_INCLUDE_IF
 
   const [searchQuery, setSearchQuery] = useState('');
@@ -453,14 +477,7 @@ export const AccountListMenu = ({
                         },
                       });
 
-                      // The account creation + renaming is handled by the
-                      // Snap account bridge, so we need to close the current
-                      // modal
-                      onClose();
-
-                      await bitcoinWalletSnapClient.createAccount(
-                        MultichainNetworks.BITCOIN,
-                      );
+                      await handleAccountCreation(MultichainNetworks.BITCOIN);
                     }}
                     data-testid="multichain-account-menu-popover-add-btc-account"
                   >
@@ -479,11 +496,7 @@ export const AccountListMenu = ({
                     size={ButtonLinkSize.Sm}
                     startIconName={IconName.Add}
                     onClick={async () => {
-                      // The account creation + renaming is handled by the Snap account bridge, so
-                      // we need to close the current modal
-                      onClose();
-
-                      await bitcoinWalletSnapClient.createAccount(
+                      await handleAccountCreation(
                         MultichainNetworks.BITCOIN_TESTNET,
                       );
                     }}

From a597a8efad4cea0a8a51346382ead50d6af14652 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 15 Nov 2024 09:39:23 -0800
Subject: [PATCH 103/111] feat: Upgrade assets controllers to 43 with
 multichain polling for token lists + detection (#28447)
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 upgrades assets controllers to version 43. It allows us to poll for
token lists and token detection across chains.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1.  Onboard to metamask
2. Verify your erc20 tokens are detected
3. Click a token
4. Verify data on token details page
5. Switch networks
6. Repeat steps 2-4

## **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: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 ...s-controllers-npm-43.1.1-c223d56176.patch} |   6 +-
 ...-assets-controllers-patch-9e00573eb4.patch |  62 +++++++++
 app/scripts/metamask-controller.js            |  38 +++---
 app/scripts/metamask-controller.test.js       | 109 ---------------
 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                                  |   2 +-
 ...rs-after-init-opt-in-background-state.json |  15 +-
 .../errors-after-init-opt-in-ui-state.json    |  15 +-
 test/e2e/tests/tokens/add-hide-token.spec.js  |   9 ++
 test/e2e/tests/tokens/import-tokens.spec.js   |  23 +++-
 ui/contexts/assetPolling.tsx                  |   4 +
 ui/hooks/useTokenDetectionPolling.ts          |  33 +++++
 ui/hooks/useTokenListPolling.test.ts          | 128 ++++++++++++++++++
 ui/hooks/useTokenListPolling.ts               |  43 ++++++
 ui/pages/asset/useHistoricalPrices.ts         |  12 +-
 .../pin-extension/pin-extension.js            |   4 +-
 .../pin-extension/pin-extension.test.js       |  36 +++--
 ui/selectors/selectors.js                     |   4 +
 ui/store/actions.ts                           |  73 +++++++++-
 yarn.lock                                     |  80 ++++++++---
 23 files changed, 516 insertions(+), 184 deletions(-)
 rename .yarn/patches/{@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch => @metamask-assets-controllers-npm-43.1.1-c223d56176.patch} (84%)
 create mode 100644 .yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch
 create mode 100644 ui/hooks/useTokenDetectionPolling.ts
 create mode 100644 ui/hooks/useTokenListPolling.test.ts
 create mode 100644 ui/hooks/useTokenListPolling.ts

diff --git a/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch b/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch
similarity index 84%
rename from .yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch
rename to .yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch
index 7a5837cd4818..2a6310c2db69 100644
--- a/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch
+++ b/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/assetsUtil.cjs b/dist/assetsUtil.cjs
-index e90a1b6767bc8ac54b7a4d580035cf5db6861dca..a5e0f03d2541b4e3540431ef2e6e4b60fb7ae9fe 100644
+index c2e83cf6caee19152aa164f1333cfef7b681e900..590b6de6e9d20ca402b82ac56b0929ab8c16c932 100644
 --- a/dist/assetsUtil.cjs
 +++ b/dist/assetsUtil.cjs
 @@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -7,10 +7,10 @@ index e90a1b6767bc8ac54b7a4d580035cf5db6861dca..a5e0f03d2541b4e3540431ef2e6e4b60
  };
  Object.defineProperty(exports, "__esModule", { value: true });
 +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
- exports.fetchTokenContractExchangeRates = exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.ethersBigNumberToBN = exports.addUrlProtocolPrefix = exports.getFormattedIpfsUrl = exports.getIpfsCIDv1AndPath = exports.removeIpfsProtocolPrefix = exports.isTokenListSupportedForNetwork = exports.isTokenDetectionSupportedForNetwork = exports.SupportedTokenDetectionNetworks = exports.formatIconUrlWithProxy = exports.formatAggregatorNames = exports.hasNewCollectionFields = exports.compareNftMetadata = exports.TOKEN_PRICES_BATCH_SIZE = void 0;
+ exports.fetchTokenContractExchangeRates = exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.ethersBigNumberToBN = exports.addUrlProtocolPrefix = exports.getFormattedIpfsUrl = exports.getIpfsCIDv1AndPath = exports.removeIpfsProtocolPrefix = exports.isTokenListSupportedForNetwork = exports.isTokenDetectionSupportedForNetwork = exports.SupportedStakedBalanceNetworks = exports.SupportedTokenDetectionNetworks = exports.formatIconUrlWithProxy = exports.formatAggregatorNames = exports.hasNewCollectionFields = exports.compareNftMetadata = exports.TOKEN_PRICES_BATCH_SIZE = void 0;
  const controller_utils_1 = require("@metamask/controller-utils");
  const utils_1 = require("@metamask/utils");
-@@ -221,7 +222,7 @@ async function getIpfsCIDv1AndPath(ipfsUrl) {
+@@ -233,7 +234,7 @@ async function getIpfsCIDv1AndPath(ipfsUrl) {
      const index = url.indexOf('/');
      const cid = index !== -1 ? url.substring(0, index) : url;
      const path = index !== -1 ? url.substring(index) : undefined;
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch b/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch
new file mode 100644
index 000000000000..1b9e5a4ba848
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch
@@ -0,0 +1,62 @@
+diff --git a/dist/TokenDetectionController.cjs b/dist/TokenDetectionController.cjs
+index ab23c95d667357db365f925c4c4acce4736797f8..8fd5efde7a3c24080f8a43f79d10300e8c271245 100644
+--- a/dist/TokenDetectionController.cjs
++++ b/dist/TokenDetectionController.cjs
+@@ -204,13 +204,10 @@ class TokenDetectionController extends (0, polling_controller_1.StaticIntervalPo
+         // Try detecting tokens via Account API first if conditions allow
+         if (supportedNetworks && chainsToDetectUsingAccountAPI.length > 0) {
+             const apiResult = await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_attemptAccountAPIDetection).call(this, chainsToDetectUsingAccountAPI, addressToDetect, supportedNetworks);
+-            // If API succeeds and no chains are left for RPC detection, we can return early
+-            if (apiResult?.result === 'success' &&
+-                chainsToDetectUsingRpc.length === 0) {
+-                return;
++            // If the account API call failed, have those chains fall back to RPC detection
++            if (apiResult?.result === 'failed') {
++                __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_addChainsToRpcDetection).call(this, chainsToDetectUsingRpc, chainsToDetectUsingAccountAPI, clientNetworks);
+             }
+-            // If API fails or chainsToDetectUsingRpc still has items, add chains to RPC detection
+-            __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_addChainsToRpcDetection).call(this, chainsToDetectUsingRpc, chainsToDetectUsingAccountAPI, clientNetworks);
+         }
+         // Proceed with RPC detection if there are chains remaining in chainsToDetectUsingRpc
+         if (chainsToDetectUsingRpc.length > 0) {
+@@ -446,8 +443,7 @@ async function _TokenDetectionController_addDetectedTokensViaAPI({ selectedAddre
+         const tokenBalancesByChain = await __classPrivateFieldGet(this, _TokenDetectionController_accountsAPI, "f")
+             .getMultiNetworksBalances(selectedAddress, chainIds, supportedNetworks)
+             .catch(() => null);
+-        if (!tokenBalancesByChain ||
+-            Object.keys(tokenBalancesByChain).length === 0) {
++        if (tokenBalancesByChain === null) {
+             return { result: 'failed' };
+         }
+         // Process each chain ID individually
+diff --git a/dist/TokenDetectionController.mjs b/dist/TokenDetectionController.mjs
+index f75eb5c2c74f2a9d15a79760985111171dc938e1..ebc30bb915cc39dabf49f9e0da84a7948ae1ed48 100644
+--- a/dist/TokenDetectionController.mjs
++++ b/dist/TokenDetectionController.mjs
+@@ -205,13 +205,10 @@ export class TokenDetectionController extends StaticIntervalPollingController()
+         // Try detecting tokens via Account API first if conditions allow
+         if (supportedNetworks && chainsToDetectUsingAccountAPI.length > 0) {
+             const apiResult = await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_attemptAccountAPIDetection).call(this, chainsToDetectUsingAccountAPI, addressToDetect, supportedNetworks);
+-            // If API succeeds and no chains are left for RPC detection, we can return early
+-            if (apiResult?.result === 'success' &&
+-                chainsToDetectUsingRpc.length === 0) {
+-                return;
++            // If the account API call failed, have those chains fall back to RPC detection
++            if (apiResult?.result === 'failed') {
++                __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_addChainsToRpcDetection).call(this, chainsToDetectUsingRpc, chainsToDetectUsingAccountAPI, clientNetworks);
+             }
+-            // If API fails or chainsToDetectUsingRpc still has items, add chains to RPC detection
+-            __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_addChainsToRpcDetection).call(this, chainsToDetectUsingRpc, chainsToDetectUsingAccountAPI, clientNetworks);
+         }
+         // Proceed with RPC detection if there are chains remaining in chainsToDetectUsingRpc
+         if (chainsToDetectUsingRpc.length > 0) {
+@@ -446,8 +443,7 @@ async function _TokenDetectionController_addDetectedTokensViaAPI({ selectedAddre
+         const tokenBalancesByChain = await __classPrivateFieldGet(this, _TokenDetectionController_accountsAPI, "f")
+             .getMultiNetworksBalances(selectedAddress, chainIds, supportedNetworks)
+             .catch(() => null);
+-        if (!tokenBalancesByChain ||
+-            Object.keys(tokenBalancesByChain).length === 0) {
++        if (tokenBalancesByChain === null) {
+             return { result: 'failed' };
+         }
+         // Process each chain ID individually
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 7aa3dfc87b92..6e2ba119053c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2606,24 +2606,12 @@ export default class MetamaskController extends EventEmitter {
     this.accountTrackerController.start();
     this.txController.startIncomingTransactionPolling();
     this.tokenDetectionController.enable();
-
-    const preferencesControllerState = this.preferencesController.state;
-
-    if (this.#isTokenListPollingRequired(preferencesControllerState)) {
-      this.tokenListController.start();
-    }
   }
 
   stopNetworkRequests() {
     this.accountTrackerController.stop();
     this.txController.stopIncomingTransactionPolling();
     this.tokenDetectionController.disable();
-
-    const preferencesControllerState = this.preferencesController.state;
-
-    if (this.#isTokenListPollingRequired(preferencesControllerState)) {
-      this.tokenListController.stop();
-    }
   }
 
   resetStates(resetMethods) {
@@ -3243,6 +3231,7 @@ export default class MetamaskController extends EventEmitter {
       currencyRateController,
       tokenDetectionController,
       ensController,
+      tokenListController,
       gasFeeController,
       metaMetricsController,
       networkController,
@@ -4045,6 +4034,19 @@ export default class MetamaskController extends EventEmitter {
           tokenRatesController,
         ),
 
+      tokenDetectionStartPolling: tokenDetectionController.startPolling.bind(
+        tokenDetectionController,
+      ),
+      tokenDetectionStopPollingByPollingToken:
+        tokenDetectionController.stopPollingByPollingToken.bind(
+          tokenDetectionController,
+        ),
+
+      tokenListStartPolling:
+        tokenListController.startPolling.bind(tokenListController),
+      tokenListStopPollingByPollingToken:
+        tokenListController.stopPollingByPollingToken.bind(tokenListController),
+
       // GasFeeController
       gasFeeStartPollingByNetworkClientId:
         gasFeeController.startPollingByNetworkClientId.bind(gasFeeController),
@@ -4408,6 +4410,7 @@ export default class MetamaskController extends EventEmitter {
       if (balance === '0x0') {
         // This account has no balance, so check for tokens
         await this.tokenDetectionController.detectTokens({
+          chainIds: [chainId],
           selectedAddress: address,
         });
 
@@ -6676,6 +6679,8 @@ export default class MetamaskController extends EventEmitter {
       this.gasFeeController.stopAllPolling();
       this.currencyRateController.stopAllPolling();
       this.tokenRatesController.stopAllPolling();
+      this.tokenDetectionController.stopAllPolling();
+      this.tokenListController.stopAllPolling();
       this.appStateController.clearPollingTokens();
     } catch (error) {
       console.error(error);
@@ -7211,15 +7216,6 @@ export default class MetamaskController extends EventEmitter {
     }
 
     this.tokenListController.updatePreventPollingOnNetworkRestart(!newEnabled);
-
-    if (newEnabled) {
-      log.debug('Started token list controller polling');
-      this.tokenListController.start();
-    } else {
-      log.debug('Stopped token list controller polling');
-      this.tokenListController.clearingTokenListData();
-      this.tokenListController.stop();
-    }
   }
 
   #isTokenListPollingRequired(preferencesControllerState) {
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 750f8771568b..2ccf864b0edd 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -2301,115 +2301,6 @@ describe('MetaMaskController', () => {
       });
     });
 
-    describe('token list controller', () => {
-      it('stops polling if petnames, simulations, and token detection disabled', async () => {
-        expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
-
-        expect(
-          TokenListController.prototype.clearingTokenListData,
-        ).not.toHaveBeenCalled();
-
-        await simulatePreferencesChange({
-          useTransactionSimulations: false,
-          useTokenDetection: false,
-          preferences: {
-            petnamesEnabled: false,
-          },
-        });
-
-        expect(TokenListController.prototype.stop).toHaveBeenCalledTimes(1);
-
-        expect(
-          TokenListController.prototype.clearingTokenListData,
-        ).toHaveBeenCalledTimes(1);
-      });
-
-      it.each([
-        [
-          'petnames',
-          {
-            preferences: { petnamesEnabled: false },
-            useTokenDetection: true,
-            useTransactionSimulations: true,
-          },
-        ],
-        [
-          'simulations',
-          {
-            preferences: { petnamesEnabled: true },
-            useTokenDetection: true,
-            useTransactionSimulations: false,
-          },
-        ],
-        [
-          'token detection',
-          {
-            preferences: { petnamesEnabled: true },
-            useTokenDetection: false,
-            useTransactionSimulations: true,
-          },
-        ],
-      ])(
-        'does not stop polling if only %s disabled',
-        async (_, preferences) => {
-          expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
-
-          expect(
-            TokenListController.prototype.clearingTokenListData,
-          ).not.toHaveBeenCalled();
-
-          await simulatePreferencesChange(preferences);
-
-          expect(TokenListController.prototype.stop).not.toHaveBeenCalled();
-
-          expect(
-            TokenListController.prototype.clearingTokenListData,
-          ).not.toHaveBeenCalled();
-        },
-      );
-
-      it.each([
-        [
-          'petnames',
-          {
-            preferences: { petnamesEnabled: true },
-            useTokenDetection: false,
-            useTransactionSimulations: false,
-          },
-        ],
-        [
-          'simulations',
-          {
-            preferences: { petnamesEnabled: false },
-            useTokenDetection: false,
-            useTransactionSimulations: true,
-          },
-        ],
-        [
-          'token detection',
-          {
-            preferences: { petnamesEnabled: false },
-            useTokenDetection: true,
-            useTransactionSimulations: false,
-          },
-        ],
-      ])('starts polling if only %s enabled', async (_, preferences) => {
-        expect(TokenListController.prototype.start).not.toHaveBeenCalled();
-
-        await simulatePreferencesChange({
-          useTransactionSimulations: false,
-          useTokenDetection: false,
-          preferences: {
-            petnamesEnabled: false,
-          },
-        });
-
-        await simulatePreferencesChange(preferences);
-
-        expect(TokenListController.prototype.start).toHaveBeenCalledTimes(1);
-      });
-    });
-
     describe('MultichainRatesController start/stop', () => {
       const mockEvmAccount = createMockInternalAccount();
       const mockNonEvmAccount = {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 2993482ec504..54659cd66695 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -686,6 +686,7 @@
       "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,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 2993482ec504..54659cd66695 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -686,6 +686,7 @@
       "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,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 2993482ec504..54659cd66695 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -686,6 +686,7 @@
       "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,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 02d73c44f420..38442fe5eb85 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -778,6 +778,7 @@
       "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,
diff --git a/package.json b/package.json
index 5bd177799bb8..e9be2caed40e 100644
--- a/package.json
+++ b/package.json
@@ -292,7 +292,7 @@
     "@metamask/address-book-controller": "^6.0.0",
     "@metamask/announcement-controller": "^7.0.0",
     "@metamask/approval-controller": "^7.0.0",
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A43.1.1%23~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch%3A%3Aversion=43.1.1&hash=5a94c2#~/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch",
     "@metamask/base-controller": "^7.0.0",
     "@metamask/bitcoin-wallet-snap": "^0.8.2",
     "@metamask/browser-passworder": "^4.3.0",
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 bb1640d99365..999dce99ca0c 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
@@ -145,8 +145,11 @@
   "MultichainBalancesController": { "balances": "object" },
   "MultichainRatesController": {
     "fiatCurrency": "usd",
-    "rates": { "btc": { "conversionDate": 0, "conversionRate": 0 } },
-    "cryptocurrencies": ["btc"]
+    "rates": {
+      "btc": { "conversionDate": 0, "conversionRate": 0 },
+      "sol": { "conversionDate": 0, "conversionRate": 0 }
+    },
+    "cryptocurrencies": ["btc", "sol"]
   },
   "NameController": { "names": "object", "nameSources": "object" },
   "NetworkController": {
@@ -313,7 +316,13 @@
   },
   "TokenListController": {
     "tokenList": "object",
-    "tokensChainsCache": {},
+    "tokensChainsCache": {
+      "0x1": "object",
+      "0x539": "object",
+      "0xaa36a7": "object",
+      "0xe705": "object",
+      "0xe708": "object"
+    },
     "preventPollingOnNetworkRestart": false
   },
   "TokenRatesController": { "marketData": "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 3d36d5fc7592..acd9d6f8d074 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
@@ -174,7 +174,13 @@
     "gasEstimateType": "none",
     "nonRPCGasFeeApisDisabled": "boolean",
     "tokenList": "object",
-    "tokensChainsCache": {},
+    "tokensChainsCache": {
+      "0x1": "object",
+      "0x539": "object",
+      "0xaa36a7": "object",
+      "0xe705": "object",
+      "0xe708": "object"
+    },
     "preventPollingOnNetworkRestart": false,
     "tokens": "object",
     "ignoredTokens": "object",
@@ -198,8 +204,11 @@
     "lastFetchedBlockNumbers": "object",
     "submitHistory": "object",
     "fiatCurrency": "usd",
-    "rates": { "btc": { "conversionDate": 0, "conversionRate": 0 } },
-    "cryptocurrencies": ["btc"],
+    "rates": {
+      "btc": { "conversionDate": 0, "conversionRate": 0 },
+      "sol": { "conversionDate": 0, "conversionRate": 0 }
+    },
+    "cryptocurrencies": ["btc", "sol"],
     "snaps": "object",
     "jobs": "object",
     "database": null,
diff --git a/test/e2e/tests/tokens/add-hide-token.spec.js b/test/e2e/tests/tokens/add-hide-token.spec.js
index c773c560949a..6bd0c8744fba 100644
--- a/test/e2e/tests/tokens/add-hide-token.spec.js
+++ b/test/e2e/tests/tokens/add-hide-token.spec.js
@@ -109,6 +109,15 @@ describe('Add existing token using search', function () {
       {
         fixtures: new FixtureBuilder({ inputChainId: CHAIN_IDS.BSC })
           .withPreferencesController({ useTokenDetection: true })
+          .withTokenListController({
+            tokenList: [
+              {
+                name: 'Basic Attention Token',
+                symbol: 'BAT',
+                address: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
+              },
+            ],
+          })
           .build(),
         ganacheOptions: {
           ...defaultGanacheOptions,
diff --git a/test/e2e/tests/tokens/import-tokens.spec.js b/test/e2e/tests/tokens/import-tokens.spec.js
index a1eb2782f9db..3055f7109551 100644
--- a/test/e2e/tests/tokens/import-tokens.spec.js
+++ b/test/e2e/tests/tokens/import-tokens.spec.js
@@ -37,7 +37,28 @@ describe('Import flow', function () {
   it('allows importing multiple tokens from search', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerOnMainnet()
+          .withTokensController({
+            tokenList: [
+              {
+                name: 'Chain Games',
+                symbol: 'CHAIN',
+                address: '0xc4c2614e694cf534d407ee49f8e44d125e4681c4',
+              },
+              {
+                address: '0x7051faed0775f664a0286af4f75ef5ed74e02754',
+                symbol: 'CHANGE',
+                name: 'ChangeX',
+              },
+              {
+                name: 'Chai',
+                symbol: 'CHAI',
+                address: '0x06af07097c9eeb7fd685c692751d5c66db49c215',
+              },
+            ],
+          })
+          .build(),
         ganacheOptions: defaultGanacheOptions,
         title: this.test.fullTitle(),
         testSpecificMock: mockPriceFetch,
diff --git a/ui/contexts/assetPolling.tsx b/ui/contexts/assetPolling.tsx
index 63cef9667fbd..be1954a37ec5 100644
--- a/ui/contexts/assetPolling.tsx
+++ b/ui/contexts/assetPolling.tsx
@@ -1,6 +1,8 @@
 import React, { ReactNode } from 'react';
 import useCurrencyRatePolling from '../hooks/useCurrencyRatePolling';
 import useTokenRatesPolling from '../hooks/useTokenRatesPolling';
+import useTokenDetectionPolling from '../hooks/useTokenDetectionPolling';
+import useTokenListPolling from '../hooks/useTokenListPolling';
 
 // This provider is a step towards making controller polling fully UI based.
 // Eventually, individual UI components will call the use*Polling hooks to
@@ -8,6 +10,8 @@ import useTokenRatesPolling from '../hooks/useTokenRatesPolling';
 export const AssetPollingProvider = ({ children }: { children: ReactNode }) => {
   useCurrencyRatePolling();
   useTokenRatesPolling();
+  useTokenDetectionPolling();
+  useTokenListPolling();
 
   return <>{children}</>;
 };
diff --git a/ui/hooks/useTokenDetectionPolling.ts b/ui/hooks/useTokenDetectionPolling.ts
new file mode 100644
index 000000000000..790384e21cbf
--- /dev/null
+++ b/ui/hooks/useTokenDetectionPolling.ts
@@ -0,0 +1,33 @@
+import { useSelector } from 'react-redux';
+import {
+  getNetworkConfigurationsByChainId,
+  getUseTokenDetection,
+} from '../selectors';
+import {
+  tokenDetectionStartPolling,
+  tokenDetectionStopPollingByPollingToken,
+} from '../store/actions';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
+import useMultiPolling from './useMultiPolling';
+
+const useTokenDetectionPolling = () => {
+  const useTokenDetection = useSelector(getUseTokenDetection);
+  const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
+  const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
+
+  const enabled = completedOnboarding && isUnlocked && useTokenDetection;
+
+  useMultiPolling({
+    startPolling: tokenDetectionStartPolling,
+    stopPollingByPollingToken: tokenDetectionStopPollingByPollingToken,
+    input: enabled ? [Object.keys(networkConfigurations)] : [],
+  });
+
+  return {};
+};
+
+export default useTokenDetectionPolling;
diff --git a/ui/hooks/useTokenListPolling.test.ts b/ui/hooks/useTokenListPolling.test.ts
new file mode 100644
index 000000000000..09a22fffea50
--- /dev/null
+++ b/ui/hooks/useTokenListPolling.test.ts
@@ -0,0 +1,128 @@
+import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import {
+  tokenListStartPolling,
+  tokenListStopPollingByPollingToken,
+} from '../store/actions';
+import useTokenListPolling from './useTokenListPolling';
+
+let mockPromises: Promise<string>[];
+
+jest.mock('../store/actions', () => ({
+  tokenListStartPolling: jest.fn().mockImplementation((input) => {
+    const promise = Promise.resolve(`${input}_token`);
+    mockPromises.push(promise);
+    return promise;
+  }),
+  tokenListStopPollingByPollingToken: jest.fn(),
+}));
+
+describe('useTokenListPolling', () => {
+  beforeEach(() => {
+    mockPromises = [];
+    jest.clearAllMocks();
+  });
+
+  it('should poll for token lists on each chain when enabled, and stop on dismount', async () => {
+    const state = {
+      metamask: {
+        isUnlocked: true,
+        completedOnboarding: true,
+        useExternalServices: true,
+        useTokenDetection: true,
+        networkConfigurationsByChainId: {
+          '0x1': {},
+          '0x89': {},
+        },
+      },
+    };
+
+    const { unmount } = renderHookWithProvider(
+      () => useTokenListPolling(),
+      state,
+    );
+
+    // Should poll each chain
+    await Promise.all(mockPromises);
+    expect(tokenListStartPolling).toHaveBeenCalledTimes(2);
+    expect(tokenListStartPolling).toHaveBeenCalledWith('0x1');
+    expect(tokenListStartPolling).toHaveBeenCalledWith('0x89');
+
+    // Stop polling on dismount
+    unmount();
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(2);
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledWith(
+      '0x1_token',
+    );
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledWith(
+      '0x89_token',
+    );
+  });
+
+  it('should not poll before onboarding is completed', async () => {
+    const state = {
+      metamask: {
+        isUnlocked: true,
+        completedOnboarding: false,
+        useExternalServices: true,
+        useTokenDetection: true,
+        networkConfigurationsByChainId: {
+          '0x1': {},
+          '0x89': {},
+        },
+      },
+    };
+
+    renderHookWithProvider(() => useTokenListPolling(), state);
+
+    await Promise.all(mockPromises);
+    expect(tokenListStartPolling).toHaveBeenCalledTimes(0);
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(0);
+  });
+
+  it('should not poll when locked', async () => {
+    const state = {
+      metamask: {
+        isUnlocked: false,
+        completedOnboarding: true,
+        useExternalServices: true,
+        useTokenDetection: true,
+        networkConfigurationsByChainId: {
+          '0x1': {},
+          '0x89': {},
+        },
+      },
+    };
+
+    renderHookWithProvider(() => useTokenListPolling(), state);
+
+    await Promise.all(mockPromises);
+    expect(tokenListStartPolling).toHaveBeenCalledTimes(0);
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(0);
+  });
+
+  it('should not poll when disabled', async () => {
+    // disabled when detection, petnames, and simulations are all disabled
+    const state = {
+      metamask: {
+        isUnlocked: true,
+        completedOnboarding: true,
+        useExternalServices: true,
+        useTokenDetection: false,
+        useTransactionSimulations: false,
+        preferences: {
+          petnamesEnabled: false,
+        },
+        networkConfigurationsByChainId: {
+          '0x1': {},
+          '0x89': {},
+        },
+      },
+    };
+
+    renderHookWithProvider(() => useTokenListPolling(), state);
+
+    await Promise.all(mockPromises);
+    expect(tokenListStartPolling).toHaveBeenCalledTimes(0);
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(0);
+  });
+});
diff --git a/ui/hooks/useTokenListPolling.ts b/ui/hooks/useTokenListPolling.ts
new file mode 100644
index 000000000000..9b43c3c6959a
--- /dev/null
+++ b/ui/hooks/useTokenListPolling.ts
@@ -0,0 +1,43 @@
+import { useSelector } from 'react-redux';
+import {
+  getNetworkConfigurationsByChainId,
+  getPetnamesEnabled,
+  getUseExternalServices,
+  getUseTokenDetection,
+  getUseTransactionSimulations,
+} from '../selectors';
+import {
+  tokenListStartPolling,
+  tokenListStopPollingByPollingToken,
+} from '../store/actions';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
+import useMultiPolling from './useMultiPolling';
+
+const useTokenListPolling = () => {
+  const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
+  const useTokenDetection = useSelector(getUseTokenDetection);
+  const useTransactionSimulations = useSelector(getUseTransactionSimulations);
+  const petnamesEnabled = useSelector(getPetnamesEnabled);
+  const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
+  const useExternalServices = useSelector(getUseExternalServices);
+
+  const enabled =
+    completedOnboarding &&
+    isUnlocked &&
+    useExternalServices &&
+    (useTokenDetection || petnamesEnabled || useTransactionSimulations);
+
+  useMultiPolling({
+    startPolling: tokenListStartPolling,
+    stopPollingByPollingToken: tokenListStopPollingByPollingToken,
+    input: enabled ? Object.keys(networkConfigurations) : [],
+  });
+
+  return {};
+};
+
+export default useTokenListPolling;
diff --git a/ui/pages/asset/useHistoricalPrices.ts b/ui/pages/asset/useHistoricalPrices.ts
index e4b28add0bc7..febf99a9daed 100644
--- a/ui/pages/asset/useHistoricalPrices.ts
+++ b/ui/pages/asset/useHistoricalPrices.ts
@@ -31,8 +31,8 @@ export const useHistoricalPrices = ({
   const [loading, setLoading] = useState<boolean>(chainSupported);
   const [data, setData] = useState<HistoricalPrices>({});
 
-  if (chainSupported) {
-    useEffect(() => {
+  useEffect(() => {
+    if (chainSupported) {
       setLoading(true);
       fetchWithCache({
         url: `https://price.api.cx.metamask.io/v1/chains/${chainId}/historical-prices/${address}?vsCurrency=${currency}&timePeriod=${timeRange}`,
@@ -59,7 +59,11 @@ export const useHistoricalPrices = ({
           setData({ prices, edges });
           setLoading(false);
         });
-    }, [chainId, address, currency, timeRange]);
-  }
+    } else {
+      setData({});
+      setLoading(false);
+    }
+  }, [chainSupported, chainId, address, currency, timeRange]);
+
   return { loading, data };
 };
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
index c9ad1806d49d..775095c2aa61 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
@@ -69,7 +69,9 @@ export default function OnboardingPinExtension() {
     if (selectedIndex === 0) {
       setSelectedIndex(1);
     } else {
-      dispatch(toggleExternalServices(externalServicesOnboardingToggleState));
+      await dispatch(
+        toggleExternalServices(externalServicesOnboardingToggleState),
+      );
       await dispatch(setCompletedOnboarding());
 
       if (externalServicesOnboardingToggleState) {
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.test.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.test.js
index 00c7c38cf1d0..22be22bd98ac 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.test.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.test.js
@@ -3,15 +3,31 @@ import { fireEvent } from '@testing-library/react';
 import reactRouterDom from 'react-router-dom';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { setBackgroundConnection } from '../../../store/background-connection';
 import { renderWithProvider } from '../../../../test/jest';
+import {
+  setCompletedOnboarding,
+  toggleExternalServices,
+} from '../../../store/actions';
 import PinExtension from './pin-extension';
 
-const completeOnboardingStub = jest
-  .fn()
-  .mockImplementation(() => Promise.resolve());
+jest.mock('../../../store/actions', () => ({
+  toggleExternalServices: jest.fn(),
+  setCompletedOnboarding: jest.fn(),
+  performSignIn: jest.fn(),
+}));
+
+const mockPromises = [];
+
+const mockDispatch = jest.fn().mockImplementation(() => {
+  const promise = Promise.resolve();
+  mockPromises.push(promise);
+  return promise;
+});
 
-const toggleExternalServicesStub = jest.fn();
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: () => mockDispatch,
+}));
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -30,10 +46,6 @@ describe('Creation Successful Onboarding View', () => {
     },
   };
   const store = configureMockStore([thunk])(mockStore);
-  setBackgroundConnection({
-    completeOnboarding: completeOnboardingStub,
-    toggleExternalServices: toggleExternalServicesStub,
-  });
 
   const pushMock = jest.fn();
   beforeAll(() => {
@@ -43,12 +55,14 @@ describe('Creation Successful Onboarding View', () => {
       .mockReturnValue({ push: pushMock });
   });
 
-  it('should call completeOnboarding in the background when Done" button is clicked', () => {
+  it('should call completeOnboarding in the background when Done" button is clicked', async () => {
     const { getByText } = renderWithProvider(<PinExtension />, store);
     const nextButton = getByText('Next');
     fireEvent.click(nextButton);
     const gotItButton = getByText('Done');
     fireEvent.click(gotItButton);
-    expect(completeOnboardingStub).toHaveBeenCalledTimes(1);
+    await Promise.all(mockPromises);
+    expect(toggleExternalServices).toHaveBeenCalledTimes(1);
+    expect(setCompletedOnboarding).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 7c407eae4dc4..aad920b6cb8b 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -954,6 +954,10 @@ export function getPetnamesEnabled(state) {
   return petnamesEnabled;
 }
 
+export function getUseTransactionSimulations(state) {
+  return Boolean(state.metamask.useTransactionSimulations);
+}
+
 export function getRedesignedConfirmationsEnabled(state) {
   const { redesignedConfirmationsEnabled } = getPreferences(state);
   return redesignedConfirmationsEnabled;
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 67de497817c8..32434d3a1d59 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -3548,13 +3548,14 @@ export function setIpfsGateway(
 export function toggleExternalServices(
   val: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  return (dispatch: MetaMaskReduxDispatch) => {
+  return async (dispatch: MetaMaskReduxDispatch) => {
     log.debug(`background.toggleExternalServices`);
-    callBackgroundMethod('toggleExternalServices', [val], (err) => {
-      if (err) {
-        dispatch(displayWarning(err));
-      }
-    });
+    try {
+      await submitRequestToBackground('toggleExternalServices', [val]);
+      await forceUpdateMetamaskState(dispatch);
+    } catch (err) {
+      dispatch(displayWarning(err));
+    }
   };
 }
 
@@ -4564,6 +4565,66 @@ export async function currencyRateStopPollingByPollingToken(
   await removePollingTokenFromAppState(pollingToken);
 }
 
+/**
+ * Informs the TokenDetectionController that the UI requires token detection polling
+ *
+ * @param chainIds - An array of chain ids to poll token detection on.
+ * @returns polling token that can be used to stop polling.
+ */
+export async function tokenDetectionStartPolling(
+  chainIds: string[],
+): Promise<string> {
+  const pollingToken = await submitRequestToBackground(
+    'tokenDetectionStartPolling',
+    [{ chainIds }],
+  );
+
+  await addPollingTokenToAppState(pollingToken);
+  return pollingToken;
+}
+
+/**
+ * Informs the TokenDetectionController that the UI no longer token detection polling
+ *
+ * @param pollingToken - Poll token received from calling tokenDetectionStartPolling
+ */
+export async function tokenDetectionStopPollingByPollingToken(
+  pollingToken: string,
+) {
+  await submitRequestToBackground('tokenDetectionStopPollingByPollingToken', [
+    pollingToken,
+  ]);
+  await removePollingTokenFromAppState(pollingToken);
+}
+
+/**
+ * Informs the TokenListController that the UI requires token list polling
+ *
+ * @param chainId
+ * @returns polling token that can be used to stop polling
+ */
+export async function tokenListStartPolling(chainId: string): Promise<string> {
+  const pollingToken = await submitRequestToBackground(
+    'tokenListStartPolling',
+    [{ chainId }],
+  );
+
+  await addPollingTokenToAppState(pollingToken);
+  return pollingToken;
+}
+
+/**
+ * Informs the TokenListController that the UI no longer token list polling
+ *
+ * @param pollingToken - Poll token received from calling tokenListStartPolling
+ */
+export async function tokenListStopPollingByPollingToken(pollingToken: string) {
+  await submitRequestToBackground('tokenListStopPollingByPollingToken', [
+    pollingToken,
+  ]);
+  await removePollingTokenFromAppState(pollingToken);
+}
+
 /**
  * Informs the TokenRatesController that the UI requires
  * token rate polling for the given chain id.
diff --git a/yarn.lock b/yarn.lock
index b7afd1eb5884..8d622a3d2d25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4934,9 +4934,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:42.0.0":
-  version: 42.0.0
-  resolution: "@metamask/assets-controllers@npm:42.0.0"
+"@metamask/assets-controllers@npm:43.1.1":
+  version: 43.1.1
+  resolution: "@metamask/assets-controllers@npm:43.1.1"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/address": "npm:^5.7.0"
@@ -4946,7 +4946,7 @@ __metadata:
     "@metamask/abi-utils": "npm:^2.0.3"
     "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^11.4.2"
+    "@metamask/controller-utils": "npm:^11.4.3"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/polling-controller": "npm:^12.0.1"
@@ -4963,18 +4963,18 @@ __metadata:
     single-call-balance-checker-abi: "npm:^1.0.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
-    "@metamask/accounts-controller": ^18.0.0
+    "@metamask/accounts-controller": ^19.0.0
     "@metamask/approval-controller": ^7.0.0
-    "@metamask/keyring-controller": ^17.0.0
+    "@metamask/keyring-controller": ^18.0.0
     "@metamask/network-controller": ^22.0.0
-    "@metamask/preferences-controller": ^13.0.0
-  checksum: 10/64d2bd43139ee5c19bd665b07212cd5d5dd41b457dedde3b5db31442292c4d064dc015011f5f001bb423683675fb20898ff652e91d2339ad1d21cc45fa93487a
+    "@metamask/preferences-controller": ^14.0.0
+  checksum: 10/e8f37928085a243f2f3a9d3b09b486f31737814d6257ee49bc2d841d2f467733b8c533c056e9ca24acdcc80414503b34b00e10abb1cdfeb8483e6fe30bc4a62f
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch":
-  version: 42.0.0
-  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch::version=42.0.0&hash=e14ff8"
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A43.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch::version=43.1.1&hash=5a94c2":
+  version: 43.1.1
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A43.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch::version=43.1.1&hash=5a94c2"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@ethersproject/address": "npm:^5.7.0"
@@ -4984,7 +4984,7 @@ __metadata:
     "@metamask/abi-utils": "npm:^2.0.3"
     "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^11.4.2"
+    "@metamask/controller-utils": "npm:^11.4.3"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/polling-controller": "npm:^12.0.1"
@@ -5001,12 +5001,50 @@ __metadata:
     single-call-balance-checker-abi: "npm:^1.0.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
-    "@metamask/accounts-controller": ^18.0.0
+    "@metamask/accounts-controller": ^19.0.0
     "@metamask/approval-controller": ^7.0.0
-    "@metamask/keyring-controller": ^17.0.0
+    "@metamask/keyring-controller": ^18.0.0
+    "@metamask/network-controller": ^22.0.0
+    "@metamask/preferences-controller": ^14.0.0
+  checksum: 10/1a3672cb721c6716d33c1c6c5e7ffc2859689407e70af7503204220afe41f6c0d20f883ad7d51089af7376e4005de7479525b3faa49113c942cf3ab1bceba154
+  languageName: node
+  linkType: hard
+
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A43.1.1%23~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch%3A%3Aversion=43.1.1&hash=5a94c2#~/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch":
+  version: 43.1.1
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A43.1.1%23~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch%3A%3Aversion=43.1.1&hash=5a94c2#~/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch::version=43.1.1&hash=c4e407"
+  dependencies:
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@ethersproject/address": "npm:^5.7.0"
+    "@ethersproject/bignumber": "npm:^5.7.0"
+    "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/providers": "npm:^5.7.0"
+    "@metamask/abi-utils": "npm:^2.0.3"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/polling-controller": "npm:^12.0.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/utils": "npm:^10.0.0"
+    "@types/bn.js": "npm:^5.1.5"
+    "@types/uuid": "npm:^8.3.0"
+    async-mutex: "npm:^0.5.0"
+    bn.js: "npm:^5.2.1"
+    cockatiel: "npm:^3.1.2"
+    immer: "npm:^9.0.6"
+    lodash: "npm:^4.17.21"
+    multiformats: "npm:^13.1.0"
+    single-call-balance-checker-abi: "npm:^1.0.0"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/accounts-controller": ^19.0.0
+    "@metamask/approval-controller": ^7.0.0
+    "@metamask/keyring-controller": ^18.0.0
     "@metamask/network-controller": ^22.0.0
-    "@metamask/preferences-controller": ^13.0.0
-  checksum: 10/9a6727b28f88fd2df3f4b1628dd5d8c2f3e73fd4b9cd090f22d175c2522faa6c6b7e9a93d0ec2b2d123a263c8f4116fbfe97f196b99401b28ac8597f522651eb
+    "@metamask/preferences-controller": ^14.0.0
+  checksum: 10/189f45b9afefef9dc54f29920eb64fcebbc1dd13d792627ab2649c973a94ca310c848411fe4b294419c881d1956ff50bd6107f7411faa2a953da005662269e40
   languageName: node
   linkType: hard
 
@@ -5087,9 +5125,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @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":
-  version: 11.4.2
-  resolution: "@metamask/controller-utils@npm:11.4.2"
+"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @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"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
@@ -5101,7 +5139,7 @@ __metadata:
     bn.js: "npm:^5.2.1"
     eth-ens-namehash: "npm:^2.0.8"
     fast-deep-equal: "npm:^3.1.3"
-  checksum: 10/fdae49ee97e7a2a1bb6414011ca59932f8712a768a9c4c43673a2504c9fa9e61d83df53a21ff0506ef6a8cf774704f2df58a6d71385c8786ec5cab4359c051e1
+  checksum: 10/5703b0721daf679cf44affc690f2b313e40893b64b0aafaf203e69ee51438197cc3634ef7094145f580a8a8aaadcb79026b2fbd4065c1bb4a8c26627a2c4c69a
   languageName: node
   linkType: hard
 
@@ -26699,7 +26737,7 @@ __metadata:
     "@metamask/announcement-controller": "npm:^7.0.0"
     "@metamask/api-specs": "npm:^0.9.3"
     "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A42.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-42.0.0-57b3d695bb.patch"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A43.1.1%23~/.yarn/patches/@metamask-assets-controllers-npm-43.1.1-c223d56176.patch%3A%3Aversion=43.1.1&hash=5a94c2#~/.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^7.0.0"
     "@metamask/bitcoin-wallet-snap": "npm:^0.8.2"

From e78d479956a91633399e7eeaa7fce2e4857e006c Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:25:28 +0000
Subject: [PATCH 104/111] Version v12.8.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e849728f7781..24d8c7f0683d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,204 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.8.0]
+### Uncategorized
+- chore: Master sync ([#28459](https://github.com/MetaMask/metamask-extension/pull/28459))
+- Merge origin/develop into master-sync
+- feat: Upgrade assets controllers to 43 with multichain polling for token lists + detection ([#28447](https://github.com/MetaMask/metamask-extension/pull/28447))
+- Version v12.7.0 RC ([#28235](https://github.com/MetaMask/metamask-extension/pull/28235))
+- fix: display btc account creation while in settings ([#28379](https://github.com/MetaMask/metamask-extension/pull/28379))
+- fix: Fix race condition validating ERC20 transfer (blockaid) ([#28487](https://github.com/MetaMask/metamask-extension/pull/28487))
+- chore: fix test path on CI ([#28482](https://github.com/MetaMask/metamask-extension/pull/28482))
+- chore: Fix flaky ERC20 transfer blockaid e2e ([#28453](https://github.com/MetaMask/metamask-extension/pull/28453))
+- test: [POM] Migrate vault decryption e2e tests to TS and Page Object Model  ([#28419](https://github.com/MetaMask/metamask-extension/pull/28419))
+- feat: UI changes to show decoding data for permits ([#28342](https://github.com/MetaMask/metamask-extension/pull/28342))
+- chore:  V12.7.0 changelog ([#28458](https://github.com/MetaMask/metamask-extension/pull/28458))
+- chore: Merge master (as of v12.6.1) into v12.7.0 ([#28468](https://github.com/MetaMask/metamask-extension/pull/28468))
+- fix: dont poll token prices during onboarding or when locked ([#28465](https://github.com/MetaMask/metamask-extension/pull/28465))
+- Fixed lint
+- fix: Allow outerclick to close import modal ([#28448](https://github.com/MetaMask/metamask-extension/pull/28448))
+- Merge remote-tracking branch 'origin/master' into resolve-conflicts-v12.7.0-master
+- fix (cherry-pick): add simulation metrics when simulation UI is not visible (#28427) ([#28427](https://github.com/MetaMask/metamask-extension/pull/28427))
+- fix: ui customizations for redesigned transactions (#28443) ([#28443](https://github.com/MetaMask/metamask-extension/pull/28443))
+- feat: add simulation metrics when simulation UI is not visible ([#28427](https://github.com/MetaMask/metamask-extension/pull/28427))
+- fix: Fix attribution generation ([#28415](https://github.com/MetaMask/metamask-extension/pull/28415))
+- test: Improve test for signatures ([#27532](https://github.com/MetaMask/metamask-extension/pull/27532))
+- fix: ui customizations for redesigned transactions ([#28443](https://github.com/MetaMask/metamask-extension/pull/28443))
+- fix: Remove multiple overlapping spinners ([#28301](https://github.com/MetaMask/metamask-extension/pull/28301))
+- fix: Hide "interacting with" when simulated balance changes are shown ([#28409](https://github.com/MetaMask/metamask-extension/pull/28409))
+- chore: Begin introducing patterns for Multichain AssetList ([#28429](https://github.com/MetaMask/metamask-extension/pull/28429))
+- feat: update signature controller and integrate decoding api ([#28397](https://github.com/MetaMask/metamask-extension/pull/28397))
+- fix: Update PortfolioView flag ([#28446](https://github.com/MetaMask/metamask-extension/pull/28446))
+- perf: Create custom spans for account overview tabs ([#28086](https://github.com/MetaMask/metamask-extension/pull/28086))
+- fix: fix network client ID used on the useGasFeeInputs hook (#28391) ([#28391](https://github.com/MetaMask/metamask-extension/pull/28391))
+- fix (cherry-pick): get `supportedChains` to avoid blocking the confirmation process ([#28422](https://github.com/MetaMask/metamask-extension/pull/28422))
+- fix: Default to dApp suggested fees only when user selects the option ([#28403](https://github.com/MetaMask/metamask-extension/pull/28403))
+- feat: btc send flow e2e ([#28340](https://github.com/MetaMask/metamask-extension/pull/28340))
+- test: fix state fixtures race condition ([#28421](https://github.com/MetaMask/metamask-extension/pull/28421))
+- test: [POM] Migrate autodetect and import nft e2e tests to use Page Object Model ([#28383](https://github.com/MetaMask/metamask-extension/pull/28383))
+- chore(deps): bump `@metamask/eth-ledger-bridge-keyring` to `^5.0.1` ([#27688](https://github.com/MetaMask/metamask-extension/pull/27688))
+- chore: limit bridge quote request frequency and cancel requests ([#27237](https://github.com/MetaMask/metamask-extension/pull/27237))
+- test: Reintegrate refactored Swap e2e tests to the pipeline ([#26493](https://github.com/MetaMask/metamask-extension/pull/26493))
+- fix: fix network client ID used on the useGasFeeInputs hook ([#28391](https://github.com/MetaMask/metamask-extension/pull/28391))
+- ci: Fix `attributions:check` silent failure ([#28413](https://github.com/MetaMask/metamask-extension/pull/28413))
+- fix: `Test Snap Cronjob can trigger a cronjob to open a di...` flaky tests ([#28363](https://github.com/MetaMask/metamask-extension/pull/28363))
+- feat: add `account_type`/`snap_id` for buy/send metrics ([#28011](https://github.com/MetaMask/metamask-extension/pull/28011))
+- fix: get `supportedChains` to avoid blocking the confirmation process ([#28313](https://github.com/MetaMask/metamask-extension/pull/28313))
+- test: [POM] Migrate reveal account srp e2e tests to use Page Object Model ([#28354](https://github.com/MetaMask/metamask-extension/pull/28354))
+- fix: Add metric trait for privacy mode ([#28335](https://github.com/MetaMask/metamask-extension/pull/28335))
+- fix: Properly ellipsize long token names ([#28392](https://github.com/MetaMask/metamask-extension/pull/28392))
+- fix(snaps): Patch `@metamask/snaps-utils` ([#28377](https://github.com/MetaMask/metamask-extension/pull/28377))
+- fix: cherry-pick: Return to send page with different asset types ([#28384](https://github.com/MetaMask/metamask-extension/pull/28384))
+- chore: Bump snaps-utils ([#28399](https://github.com/MetaMask/metamask-extension/pull/28399))
+- feat: migrate MetaMetricsController to BaseControllerV2 ([#28113](https://github.com/MetaMask/metamask-extension/pull/28113))
+- feat: change expand icon per new design ([#28267](https://github.com/MetaMask/metamask-extension/pull/28267))
+- chore: add unit test for `useMultiPolling` ([#28387](https://github.com/MetaMask/metamask-extension/pull/28387))
+- feat(Solana): add "Add a new Solana account" link to the account creation dialog ([#28270](https://github.com/MetaMask/metamask-extension/pull/28270))
+- fix: Return to send page with different asset types ([#28382](https://github.com/MetaMask/metamask-extension/pull/28382))
+- cherry-pick: bump `@metamask/queued-request-controller` with patch fix (#28355) ([#28355](https://github.com/MetaMask/metamask-extension/pull/28355))
+- test: [POM] Refactor import account e2e tests to use Page Object Model ([#28325](https://github.com/MetaMask/metamask-extension/pull/28325))
+- feat(1852): Implement sentry user report on error screen ([#27857](https://github.com/MetaMask/metamask-extension/pull/27857))
+- fix: disable buy for btc testnet accounts ([#28341](https://github.com/MetaMask/metamask-extension/pull/28341))
+- fix: Address design review for ERC20 token send ([#28212](https://github.com/MetaMask/metamask-extension/pull/28212))
+- refactor: remove global network usage from transaction confirmations ([#28236](https://github.com/MetaMask/metamask-extension/pull/28236))
+- build: update yarn to v4.5.1 ([#28365](https://github.com/MetaMask/metamask-extension/pull/28365))
+- fix: Bug 28347 - Privacy mode tweaks (#28367) ([#28367](https://github.com/MetaMask/metamask-extension/pull/28367))
+- fix: Bug 28347 - Privacy mode tweaks ([#28367](https://github.com/MetaMask/metamask-extension/pull/28367))
+- fix: mv2 firefox csp header ([#27770](https://github.com/MetaMask/metamask-extension/pull/27770))
+- perf: ensure `setupLocale` doesn't fetch `_locales/en/messages.json` twice ([#26553](https://github.com/MetaMask/metamask-extension/pull/26553))
+- fix: bump `@metamask/queued-request-controller` with patch fix ([#28355](https://github.com/MetaMask/metamask-extension/pull/28355))
+- fix (Cherrypick v12.7.0 ): disable account syncing ([#28361](https://github.com/MetaMask/metamask-extension/pull/28361))
+- fix: Revert "fix: Negate privacy mode in Send screen" ([#28360](https://github.com/MetaMask/metamask-extension/pull/28360))
+- fix: disable account syncing ([#28359](https://github.com/MetaMask/metamask-extension/pull/28359))
+- Cherrypick v12.7.0 feat: Add simulation metrics to "Transaction Submitted" and "Transaction Finalized" events  ([#28314](https://github.com/MetaMask/metamask-extension/pull/28314))
+- feat: Convert mmi controller to a non-controller ([#27983](https://github.com/MetaMask/metamask-extension/pull/27983))
+- Cherrypick v12.7.0 feat: Enable simulation metrics for redesign transactions ([#28324](https://github.com/MetaMask/metamask-extension/pull/28324))
+- cherry pick: chore: add the gas_included prop into Quotes Received event ([#28351](https://github.com/MetaMask/metamask-extension/pull/28351))
+- cherry pick: fix: smart transactions in redesigned confirmations ([#28353](https://github.com/MetaMask/metamask-extension/pull/28353))
+- fix: Updates to the simulations component ([#28107](https://github.com/MetaMask/metamask-extension/pull/28107))
+- refactor: rename SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST ([#28337](https://github.com/MetaMask/metamask-extension/pull/28337))
+- chore: adds Solana snap to preinstall list ([#28141](https://github.com/MetaMask/metamask-extension/pull/28141))
+- feat: Show network badge in detected tokens modal ([#28231](https://github.com/MetaMask/metamask-extension/pull/28231))
+- fix: Negate privacy mode in Send screen ([#28248](https://github.com/MetaMask/metamask-extension/pull/28248))
+- feat: adds solana feature, code fence ([#28320](https://github.com/MetaMask/metamask-extension/pull/28320))
+- build(webpack): fix cache issues in webpack build by updating `html-bundler-webpack-plugin` to v4.4.1 ([#28225](https://github.com/MetaMask/metamask-extension/pull/28225))
+- feat: team-label-token ([#28134](https://github.com/MetaMask/metamask-extension/pull/28134))
+- chore: add Solana shared utilities and constants ([#28269](https://github.com/MetaMask/metamask-extension/pull/28269))
+- chore: Remove STX opt in modal ([#28291](https://github.com/MetaMask/metamask-extension/pull/28291))
+- chore: revert commit `3da34f4` (feat: btc e2e tests (#27986)) ([#27986](https://github.com/MetaMask/metamask-extension/pull/27986))
+- chore: e2e quality gate enhancement ([#28206](https://github.com/MetaMask/metamask-extension/pull/28206))
+- chore: adding e2e tests for NFT permit ([#28004](https://github.com/MetaMask/metamask-extension/pull/28004))
+- feat: Enable simulation metrics for redesign transactions ([#28280](https://github.com/MetaMask/metamask-extension/pull/28280))
+- fix: GasDetailItem invalid paddingStart prop ([#28281](https://github.com/MetaMask/metamask-extension/pull/28281))
+- fix: use transaction address to get lock for custom nonce ([#28272](https://github.com/MetaMask/metamask-extension/pull/28272))
+- fix: flaky test `Phishing Detection Via Iframe should redirect users to the the MetaMask Phishing Detection page when an iframe domain is on the phishing blocklist` ([#28293](https://github.com/MetaMask/metamask-extension/pull/28293))
+- chore: add the gas_included prop into Quotes Requested event ([#28295](https://github.com/MetaMask/metamask-extension/pull/28295))
+- test: [POM] Refactor e2e tests to use onboarding flows defined in Page Object Models ([#28202](https://github.com/MetaMask/metamask-extension/pull/28202))
+- feat: btc e2e tests ([#27986](https://github.com/MetaMask/metamask-extension/pull/27986))
+- fix: remove scroll-to-bottom requirement in redesigned transaction confirmations ([#27910](https://github.com/MetaMask/metamask-extension/pull/27910))
+- chore: Add gravity logo and image mappings ([#28306](https://github.com/MetaMask/metamask-extension/pull/28306))
+- chore: Bump Snaps packages ([#28215](https://github.com/MetaMask/metamask-extension/pull/28215))
+- feat: Add simulation metrics to "Transaction Submitted" and "Transaction Finalized" events ([#28240](https://github.com/MetaMask/metamask-extension/pull/28240))
+- fix: smart transactions in redesigned confirmations ([#28273](https://github.com/MetaMask/metamask-extension/pull/28273))
+- fix: unit flaky test `AddContact component › should disable submit button when input is not a valid address` ([#27941](https://github.com/MetaMask/metamask-extension/pull/27941))
+- fix: Hide fiat values on test networks ([#28219](https://github.com/MetaMask/metamask-extension/pull/28219))
+- chore: display bridge quotes ([#28031](https://github.com/MetaMask/metamask-extension/pull/28031))
+- fix: Permit message, dataTree value incorrectly using default ERC20 decimals for non-ERC20 token values ([#28142](https://github.com/MetaMask/metamask-extension/pull/28142))
+- fix: ignore error when getTokenStandardAndDetails fails ([#28030](https://github.com/MetaMask/metamask-extension/pull/28030))
+- fix: notification settings type ([#28271](https://github.com/MetaMask/metamask-extension/pull/28271))
+- chore: use accounts api for token detection ([#28254](https://github.com/MetaMask/metamask-extension/pull/28254))
+- fix: Fix alignment of long RPC labels in Networks menu ([#28244](https://github.com/MetaMask/metamask-extension/pull/28244))
+- feat: adds the experimental toggle for Solana  ([#28190](https://github.com/MetaMask/metamask-extension/pull/28190))
+- feat: multi chain polling for token prices ([#28158](https://github.com/MetaMask/metamask-extension/pull/28158))
+- refactor: move `getInternalAccounts` from `selectors.js` to `accounts.ts` ([#27645](https://github.com/MetaMask/metamask-extension/pull/27645))
+- fix: Add different copy for tooltip when a snap is requesting a signature ([#27492](https://github.com/MetaMask/metamask-extension/pull/27492))
+- fix: Prevent coercing symbols to zero in the edit spending cap modal ([#28192](https://github.com/MetaMask/metamask-extension/pull/28192))
+- test: [POM] Migrate edit network rpc e2e tests and create related page class functions ([#28161](https://github.com/MetaMask/metamask-extension/pull/28161))
+- refactor: remove global network usage from signatures ([#28167](https://github.com/MetaMask/metamask-extension/pull/28167))
+- fix: margin on asset chart min/max indicators ([#27916](https://github.com/MetaMask/metamask-extension/pull/27916))
+- feat: add token verification source count and link to block explorer ([#27759](https://github.com/MetaMask/metamask-extension/pull/27759))
+- chore: Remove obsolete preview build support ([#27968](https://github.com/MetaMask/metamask-extension/pull/27968))
+- fix: Removing `warning` prop from settings ([#27990](https://github.com/MetaMask/metamask-extension/pull/27990))
+- chore: Adding installType to Sentry Tags for easy filtering ([#28084](https://github.com/MetaMask/metamask-extension/pull/28084))
+- chore: remove broken link in docs ([#28232](https://github.com/MetaMask/metamask-extension/pull/28232))
+- fix: Error handling for the state log download failure ([#26999](https://github.com/MetaMask/metamask-extension/pull/26999))
+- feat: Upgrade alert controller to base controller v2 ([#28054](https://github.com/MetaMask/metamask-extension/pull/28054))
+- chore: improve token lookup performance in `useAccountTotalFiatBalance` ([#28233](https://github.com/MetaMask/metamask-extension/pull/28233))
+- chore: Modify changelog title to fix ci job  ([#28237](https://github.com/MetaMask/metamask-extension/pull/28237))
+- Version v12.7.0
+- chore: Master sync ([#28222](https://github.com/MetaMask/metamask-extension/pull/28222))
+- Merge origin/develop into master-sync
+- refactor: move `getSelectedInternalAccount` from `selectors.js` to `accounts.ts` ([#27644](https://github.com/MetaMask/metamask-extension/pull/27644))
+- feat: Improve provider method metrics for add/switch chain ([#28214](https://github.com/MetaMask/metamask-extension/pull/28214))
+- fix: Fix left-aligned fullscreen UI ([#28218](https://github.com/MetaMask/metamask-extension/pull/28218))
+- test: add ui render for debug ui integration tests ([#27621](https://github.com/MetaMask/metamask-extension/pull/27621))
+- feat: poll native currency prices across chains ([#28196](https://github.com/MetaMask/metamask-extension/pull/28196))
+- test: Fix data deletion e2e tests ([#28221](https://github.com/MetaMask/metamask-extension/pull/28221))
+- chore: Add a new transaction event prop ([#28153](https://github.com/MetaMask/metamask-extension/pull/28153))
+- feat: Copy updates to satisfy UK regulation requirements ([#28157](https://github.com/MetaMask/metamask-extension/pull/28157))
+- fix: flaky test `BTC Account - Overview has balance` ([#28181](https://github.com/MetaMask/metamask-extension/pull/28181))
+- chore: poll for bridge quotes ([#28029](https://github.com/MetaMask/metamask-extension/pull/28029))
+- chore: update confirmations code ownership ([#27862](https://github.com/MetaMask/metamask-extension/pull/27862))
+- feat(snaps): Add `useDisplayName` hook ([#27868](https://github.com/MetaMask/metamask-extension/pull/27868))
+- chore: upgrade signature controller to remove global network ([#28063](https://github.com/MetaMask/metamask-extension/pull/28063))
+- chore: update bridge quote request on input change ([#28028](https://github.com/MetaMask/metamask-extension/pull/28028))
+- chore: bump asset controllers to 39 + polling API ([#28025](https://github.com/MetaMask/metamask-extension/pull/28025))
+- fix: incorrect standard swap gas fee estimation ([#28127](https://github.com/MetaMask/metamask-extension/pull/28127))
+- feat: Capture 3 existing properties within non-anonymous transaction … ([#28144](https://github.com/MetaMask/metamask-extension/pull/28144))
+- refactor: remove global network usage from transaction simulation ([#27895](https://github.com/MetaMask/metamask-extension/pull/27895))
+- test(ramps): fixes btc native token test ([#27601](https://github.com/MetaMask/metamask-extension/pull/27601))
+- refactor: clean up profile sync hooks ([#28132](https://github.com/MetaMask/metamask-extension/pull/28132))
+- chore: ignore warning for ethereumjs-wallet ([#28145](https://github.com/MetaMask/metamask-extension/pull/28145))
+- test: [Snaps E2E] Unified methods and clean up snaps e2e tests ([#27684](https://github.com/MetaMask/metamask-extension/pull/27684))
+- chore: update @metamask/bitcoin-wallet-snap to 0.8.2 ([#28135](https://github.com/MetaMask/metamask-extension/pull/28135))
+- chore: small storybook and docs updates to SensitiveText component ([#28089](https://github.com/MetaMask/metamask-extension/pull/28089))
+- chore: bridge-api fetchBridgeQuotes util ([#28027](https://github.com/MetaMask/metamask-extension/pull/28027))
+- feat: update phishing controller version ([#28131](https://github.com/MetaMask/metamask-extension/pull/28131))
+- fix: broken not existing type file import ([#28055](https://github.com/MetaMask/metamask-extension/pull/28055))
+- test: blockaid update version and reenable specs ([#28121](https://github.com/MetaMask/metamask-extension/pull/28121))
+- test: [POM] Migrate onboarding infura call privacy e2e tests  ([#28079](https://github.com/MetaMask/metamask-extension/pull/28079))
+- feat: share the same user storage mock instance in tests ([#28119](https://github.com/MetaMask/metamask-extension/pull/28119))
+- chore: Using button icon component for clikable icons ([#28082](https://github.com/MetaMask/metamask-extension/pull/28082))
+- feat: convert MetaMetricsController to typescript ([#28072](https://github.com/MetaMask/metamask-extension/pull/28072))
+- feat: improved way to trigger mmi e2e tests ([#27932](https://github.com/MetaMask/metamask-extension/pull/27932))
+- test: allow more simple findElement by data-testid ([#28065](https://github.com/MetaMask/metamask-extension/pull/28065))
+- fix: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-stream@^8 ([#28060](https://github.com/MetaMask/metamask-extension/pull/28060))
+- fix(devDeps): babel@7.23.2->7.25.9 ([#28068](https://github.com/MetaMask/metamask-extension/pull/28068))
+- feat: better storybook stories for the notification pages ([#27861](https://github.com/MetaMask/metamask-extension/pull/27861))
+- fix: update storybook to support NFT images ([#28105](https://github.com/MetaMask/metamask-extension/pull/28105))
+- fix: broken test `Vault Decryptor Page is able to decrypt the vault uploading the log file in the vault-decryptor webapp` ([#28098](https://github.com/MetaMask/metamask-extension/pull/28098))
+- test: Complete missing step for add a contact to the address book in existing E2E test ([#27959](https://github.com/MetaMask/metamask-extension/pull/27959))
+- feat(3419): sensitive text component ([#28056](https://github.com/MetaMask/metamask-extension/pull/28056))
+- test: Added e2e for switch network ([#27967](https://github.com/MetaMask/metamask-extension/pull/27967))
+- fix: c2 bypass ([#28057](https://github.com/MetaMask/metamask-extension/pull/28057))
+- test: NOTIFY-1256 - Extending E2E tests for Account Sync ([#28067](https://github.com/MetaMask/metamask-extension/pull/28067))
+- test: notifications integration tests ([#28022](https://github.com/MetaMask/metamask-extension/pull/28022))
+- chore: update stories for name component ([#28049](https://github.com/MetaMask/metamask-extension/pull/28049))
+- fix: flaky anti-pattern getText + assert 3 ([#28062](https://github.com/MetaMask/metamask-extension/pull/28062))
+- test: [POM] Create onboarding related page object modal base pages and migrate e2e tests  ([#28036](https://github.com/MetaMask/metamask-extension/pull/28036))
+- docs: update debugging sentry step 3 ([#28034](https://github.com/MetaMask/metamask-extension/pull/28034))
+- fix: Support dynamic native token name on gas component ([#28048](https://github.com/MetaMask/metamask-extension/pull/28048))
+- fix: Fall back to token list for the token symbol ([#28003](https://github.com/MetaMask/metamask-extension/pull/28003))
+- fix: flaky anti-pattern getText + assert 2 ([#28043](https://github.com/MetaMask/metamask-extension/pull/28043))
+- fix(deps): @metamask/eth-json-rpc-filters@^8.0.0->^9.0.0 ([#27956](https://github.com/MetaMask/metamask-extension/pull/27956))
+- chore: Bump gridplus-sdk to 2.7.1 ([#28008](https://github.com/MetaMask/metamask-extension/pull/28008))
+- fix(deps): @keystonehq/metamask-airgapped-keyring@^0.13.1->^0.14.1 ([#27952](https://github.com/MetaMask/metamask-extension/pull/27952))
+- refactor: use `reselect`'s `createSelector` instead of going through `@redux/toolkit`, as the import names collide when trying to merge files. ([#27643](https://github.com/MetaMask/metamask-extension/pull/27643))
+- fix: storybook `getManifest` issue ([#28010](https://github.com/MetaMask/metamask-extension/pull/28010))
+- feat: bump @metamask/notification-services-controller from 0.7.0 to 0.11.0 ([#28017](https://github.com/MetaMask/metamask-extension/pull/28017))
+- refactor: remove global network usage from petnames ([#27946](https://github.com/MetaMask/metamask-extension/pull/27946))
+- chore: updated package ([#28002](https://github.com/MetaMask/metamask-extension/pull/28002))
+- feat(NOTIFY-1245): add account syncing E2E helpers & basic tests ([#28005](https://github.com/MetaMask/metamask-extension/pull/28005))
+- fix: Fix stream re-initialization ([#28024](https://github.com/MetaMask/metamask-extension/pull/28024))
+- refactor: routes.component.js and creation of ToastMaster ([#27735](https://github.com/MetaMask/metamask-extension/pull/27735))
+- fix: @metamask/eth-json-rpc-filters@^7.0.0->^8.0.0 ([#27917](https://github.com/MetaMask/metamask-extension/pull/27917))
+- refactor: remove relative imports to `selectors/index.js` from other selectors files ([#27642](https://github.com/MetaMask/metamask-extension/pull/27642))
+- refactor: remove circular dependency between `ui/ducks/custom-gas.js` and `ui/selectors/index.js` ([#27640](https://github.com/MetaMask/metamask-extension/pull/27640))
+- test: update notification date tests to be timezone agnostic ([#27925](https://github.com/MetaMask/metamask-extension/pull/27925))
+- fix: updated event name for site cell component ([#27981](https://github.com/MetaMask/metamask-extension/pull/27981))
+- fix(deps): gridplus-sdk@2.5.1->~2.6.0 ([#27973](https://github.com/MetaMask/metamask-extension/pull/27973))
+
 ## [12.7.0]
 ### Added
 - Added Token Network Filter UI, allowing users to filter tokens by network (behind a feature flag) ([#27884](https://github.com/MetaMask/metamask-extension/pull/27884))
@@ -5343,7 +5541,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.7.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.8.0...HEAD
+[12.8.0]: https://github.com/MetaMask/metamask-extension/compare/v12.7.0...v12.8.0
 [12.7.0]: https://github.com/MetaMask/metamask-extension/compare/v12.6.1...v12.7.0
 [12.6.1]: https://github.com/MetaMask/metamask-extension/compare/v12.6.0...v12.6.1
 [12.6.0]: https://github.com/MetaMask/metamask-extension/compare/v12.5.1...v12.6.0
diff --git a/package.json b/package.json
index ae2ebbd338a9..eb22bd32b4c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.7.0",
+  "version": "12.8.0",
   "private": true,
   "repository": {
     "type": "git",

From 5fa1028ab6ef6052c248b241b5108eab9755e406 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 15 Nov 2024 23:30:05 +0000
Subject: [PATCH 105/111] Update Attributions

---
 attribution.txt | 11018 ++++++++++++++++++++++------------------------
 1 file changed, 5344 insertions(+), 5674 deletions(-)

diff --git a/attribution.txt b/attribution.txt
index 364128f620f3..dd0a941aadd8 100644
--- a/attribution.txt
+++ b/attribution.txt
@@ -50,6 +50,61 @@ 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.
 
+******************************
+
+@adraffy/ens-normalize
+1.10.1 <https://github.com/adraffy/ens-normalize.js>
+MIT License
+
+Copyright (c) 2021 Andrew Raffensperger
+
+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.
+
+
+******************************
+
+aes-js
+3.0.0 <https://github.com/ricmoo/aes-js>
+The MIT License (MIT)
+
+Copyright (c) 2015 Richard Moore
+
+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.
+
+
+
 ******************************
 
 aes-js
@@ -78,6 +133,34 @@ THE SOFTWARE.
 
 
 
+******************************
+
+aes-js
+4.0.0-beta.5 <https://github.com/ricmoo/aes-js>
+The MIT License (MIT)
+
+Copyright (c) 2022 Richard Moore
+
+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.
+
+
+
 ******************************
 
 agent-base
@@ -337,21 +420,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-ansi-regex
-6.0.1 <https://github.com/chalk/ansi-regex>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 ansi-styles
@@ -382,54 +450,14 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-ansi-styles
-6.2.1 <https://github.com/chalk/ansi-styles>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
-******************************
-
-any-promise
-1.3.0 <https://github.com/kevinbeaty/any-promise>
-Copyright (C) 2014-2016 Kevin Beaty
-
-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.
-
-
 ******************************
 
 apg-js
-4.1.1 <https://github.com/ldthomas/apg-js>
+4.4.0 <https://github.com/ldthomas/apg-js>
 ## [2-Clause BSD License](https://opensource.org/licenses/BSD-2-Clause)
 
 <p>
-Copyright (c) 2021 Lowell D. Thomas<br>
+Copyright (c) 2024 Lowell D. Thomas<br>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -459,7 +487,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************
 
 array-buffer-byte-length
-1.0.0 <https://github.com/inspect-js/array-buffer-byte-length>
+1.0.1 <https://github.com/inspect-js/array-buffer-byte-length>
 MIT License
 
 Copyright (c) 2023 Inspect JS
@@ -534,33 +562,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-async-mutex
-0.2.6 <https://github.com/DirtyHairy/async-mutex>
-The MIT License (MIT)
-
-Copyright (c) 2016 Christian Speckner <cnspeckn@googlemail.com>
-
-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.
-
-
 ******************************
 
 async-mutex
@@ -618,7 +619,7 @@ THE SOFTWARE.
 ******************************
 
 available-typed-arrays
-1.0.5 <https://github.com/inspect-js/available-typed-arrays>
+1.0.7 <https://github.com/inspect-js/available-typed-arrays>
 MIT License
 
 Copyright (c) 2020 Inspect JS
@@ -672,14 +673,26 @@ SOFTWARE.
 ******************************
 
 axios
-1.6.8 <https://github.com/axios/axios>
-# Copyright (c) 2014-present Matt Zabriskie & Collaborators
+0.28.1 <https://github.com/axios/axios>
+Copyright (c) 2014-present Matt Zabriskie
 
-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:
+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 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.
+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.
 
 
 ******************************
@@ -706,7 +719,7 @@ PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @babel/code-frame
-7.10.4 <https://github.com/babel/babel>
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -733,8 +746,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/code-frame
-7.24.2 <https://github.com/babel/babel>
+@babel/compat-data
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -761,8 +774,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/compat-data
-7.23.2 <https://github.com/babel/babel>
+@babel/core
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -789,8 +802,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/core
-7.23.2 <https://github.com/babel/babel>
+@babel/generator
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -817,8 +830,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/generator
-7.24.5 <https://github.com/babel/babel>
+@babel/helper-annotate-as-pure
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -845,8 +858,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-annotate-as-pure
-7.22.5 <https://github.com/babel/babel>
+@babel/helper-compilation-targets
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -873,8 +886,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-compilation-targets
-7.22.15 <https://github.com/babel/babel>
+@babel/helper-create-class-features-plugin
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -901,8 +914,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-create-class-features-plugin
-7.24.5 <https://github.com/babel/babel>
+@babel/helper-member-expression-to-functions
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -929,8 +942,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-environment-visitor
-7.22.20 <https://github.com/babel/babel>
+@babel/helper-module-imports
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -957,8 +970,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-function-name
-7.23.0 <https://github.com/babel/babel>
+@babel/helper-module-transforms
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -985,8 +998,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-hoist-variables
-7.22.5 <https://github.com/babel/babel>
+@babel/helper-optimise-call-expression
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1013,8 +1026,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-member-expression-to-functions
-7.24.5 <https://github.com/babel/babel>
+@babel/helper-plugin-utils
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1041,8 +1054,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-module-imports
-7.24.3 <https://github.com/babel/babel>
+@babel/helper-replace-supers
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1069,8 +1082,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-module-transforms
-7.24.5 <https://github.com/babel/babel>
+@babel/helpers
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1097,8 +1110,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-optimise-call-expression
-7.22.5 <https://github.com/babel/babel>
+@babel/helper-simple-access
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1125,8 +1138,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-plugin-utils
-7.24.5 <https://github.com/babel/babel>
+@babel/helper-skip-transparent-expression-wrappers
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1153,8 +1166,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-replace-supers
-7.24.1 <https://github.com/babel/babel>
+@babel/helper-string-parser
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1181,8 +1194,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helpers
-7.23.2 <https://github.com/babel/babel>
+@babel/helper-validator-identifier
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1209,8 +1222,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-simple-access
-7.24.5 <https://github.com/babel/babel>
+@babel/helper-validator-option
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1237,8 +1250,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-skip-transparent-expression-wrappers
-7.22.5 <https://github.com/babel/babel>
+@babel/highlight
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1265,8 +1278,33 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-split-export-declaration
-7.24.5 <https://github.com/babel/babel>
+@babel/parser
+7.25.9 <https://github.com/babel/babel>
+Copyright (C) 2012-2014 by various contributors (see AUTHORS)
+
+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.
+
+
+******************************
+
+@babel/plugin-syntax-jsx
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1293,8 +1331,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-string-parser
-7.24.1 <https://github.com/babel/babel>
+@babel/plugin-syntax-typescript
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1321,8 +1359,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-validator-identifier
-7.24.5 <https://github.com/babel/babel>
+@babel/plugin-transform-modules-commonjs
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1349,8 +1387,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/helper-validator-option
-7.23.5 <https://github.com/babel/babel>
+@babel/plugin-transform-typescript
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1377,8 +1415,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/highlight
-7.24.5 <https://github.com/babel/babel>
+@babel/preset-typescript
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1405,204 +1443,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-@babel/parser
-7.24.5 <https://github.com/babel/babel>
-Copyright (C) 2012-2014 by various contributors (see AUTHORS)
-
-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:
+@babel/runtime
+7.25.9 <https://github.com/babel/babel>
+MIT License
 
-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.
-
-
-******************************
-
-@babel/plugin-syntax-jsx
-7.24.1 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/plugin-syntax-typescript
-7.24.1 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/plugin-transform-modules-commonjs
-7.24.1 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/plugin-transform-typescript
-7.24.5 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/preset-typescript
-7.24.1 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/runtime
-7.24.0 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-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.
-
-
-******************************
-
-@babel/runtime
-7.24.5 <https://github.com/babel/babel>
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) 2014-present Sebastian McKenzie and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -1627,7 +1472,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 @babel/template
-7.22.15 <https://github.com/babel/babel>
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1655,7 +1500,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 @babel/traverse
-7.24.5 <https://github.com/babel/babel>
+7.25.9 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1683,7 +1528,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 @babel/types
-7.24.5 <https://github.com/babel/babel>
+7.26.0 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -1790,6 +1635,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+base58-js
+1.0.5 <https://github.com/pur3miish/base58-js>
+MIT License
+
+Copyright (c) 2021 pur3miish
+
+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.
+
+
 ******************************
 
 base64-js
@@ -1817,6 +1689,34 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+******************************
+
+base-x
+3.0.10 <https://github.com/cryptocoinjs/base-x>
+The MIT License (MIT)
+
+Copyright (c) 2018 base-x contributors
+Copyright (c) 2014-2018 The Bitcoin Core developers
+
+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.
+
+
 ******************************
 
 base-x
@@ -1873,6 +1773,34 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+base-x
+5.0.0 <https://github.com/cryptocoinjs/base-x>
+The MIT License (MIT)
+
+Copyright (c) 2018 base-x contributors
+Copyright (c) 2014-2018 The Bitcoin Core developers
+
+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.
+
+
 ******************************
 
 bchaddrjs
@@ -2295,11 +2223,38 @@ SOFTWARE.
 
 ******************************
 
-bitcoin-ops
-1.4.1 <https://github.com/bitcoinjs/bitcoin-ops>
+bitcoin-address-validation
+2.2.3 <https://github.com/ruigomeseu/bitcoin-address-validation>
 The MIT License (MIT)
 
-Copyright (c) 2016 Daniel Cousens
+Copyright (c) 2018 Rui Gomes <hello@ruigomes.me>
+
+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.
+
+
+******************************
+
+bitcoin-ops
+1.4.1 <https://github.com/bitcoinjs/bitcoin-ops>
+The MIT License (MIT)
+
+Copyright (c) 2016 Daniel Cousens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2323,10 +2278,10 @@ SOFTWARE.
 ******************************
 
 bitwise
-2.1.0 <https://github.com/FlorianWendelborn/bitwise>
+2.2.1 <https://github.com/FlorianWendelborn/bitwise>
 # The MIT License (MIT)
 
-Copyright (c) `2019` Florian Wendelborn
+Copyright (c) `2023` Florian Wendelborn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2410,7 +2365,7 @@ SOFTWARE.
 ******************************
 
 @blockaid/ppom_release
-1.4.6 <>
+1.5.3 <>
 Blockaid BSL License, Version 1.0 (EPL-1.0)
 
 Licensor:  Blockaid, Inc.
@@ -2488,7 +2443,7 @@ SOFTWARE.
 ******************************
 
 borc
-2.1.2 <https://github.com/dignifiedquire/borc>
+3.0.0 <https://github.com/dignifiedquire/borc>
 The MIT License (MIT)
 
 Copyright (c) 2016 Friedel Ziegelmayer
@@ -2763,37 +2718,6 @@ programs and associated documentation files created by the
 Original Author, when distributed with the Software.
 
 
-******************************
-
-bplist-creator
-0.1.1 <https://github.com/nearinfinity/node-bplist-creator>
-(The MIT License)
-
-Copyright (c) 2012 Near Infinity Corporation
-
-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.
-
-
-******************************
-
-bplist-parser
-0.3.2 <https://github.com/nearinfinity/node-bplist-parser>
-license: MIT
-authors: Joe Ferner <joe.ferner@nearinfinity.com>
-
 ******************************
 
 brace-expansion
@@ -2821,33 +2745,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-brace-expansion
-2.0.1 <https://github.com/juliangruber/brace-expansion>
-MIT License
-
-Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
-
-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.
-
-
 ******************************
 
 brorand
@@ -2961,7 +2858,7 @@ IN THE SOFTWARE.
 ******************************
 
 browserslist
-4.23.0 <https://github.com/browserslist/browserslist>
+4.24.2 <https://github.com/browserslist/browserslist>
 The MIT License (MIT)
 
 Copyright 2014 Andrey Sitnik <andrey@sitnik.ru> and other contributors
@@ -3018,6 +2915,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+bs58
+6.0.0 <https://github.com/cryptocoinjs/bs58>
+MIT License
+
+Copyright (c) 2018 cryptocoinjs
+
+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.
+
+
 ******************************
 
 bs58check
@@ -3072,6 +2996,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+bs58check
+4.0.0 <https://github.com/bitcoinjs/bs58check>
+The MIT License (MIT)
+
+Copyright (c) 2017 Daniel Cousens
+
+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.
+
+
 ******************************
 
 buffer
@@ -3295,7 +3246,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 call-bind
-1.0.6 <https://github.com/ljharb/call-bind>
+1.0.7 <https://github.com/ljharb/call-bind>
 MIT License
 
 Copyright (c) 2020 Jordan Harband
@@ -3322,7 +3273,7 @@ SOFTWARE.
 ******************************
 
 caniuse-lite
-1.0.30001600 <https://github.com/browserslist/caniuse-lite>
+1.0.30001669 <https://github.com/browserslist/caniuse-lite>
 Attribution 4.0 International
 
 =======================================================================
@@ -3720,34 +3671,6 @@ public licenses.
 Creative Commons may be contacted at creativecommons.org.
 
 
-******************************
-
-case
-1.6.3 <https://github.com/nbubna/Case>
-Copyright (c) 2013 Nathan Bubna
-
-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.
-
-
 ******************************
 
 cashaddrjs
@@ -3816,286 +3739,54 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ******************************
 
-@chainsafe/as-sha256
-0.3.1 <https://github.com/chainsafe/as-sha256>
-   Copyright 2019 ChainSafe Systems
+chalk
+2.4.2 <https://github.com/chalk/chalk>
+MIT License
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-       http://www.apache.org/licenses/LICENSE-2.0
+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:
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+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.
 
 
 ******************************
 
-@chainsafe/persistent-merkle-tree
-0.4.2 <https://github.com/ChainSafe/persistent-merkle-tree>
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+chalk
+4.1.2 <https://github.com/chalk/chalk>
+MIT License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-   1. Definitions.
+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:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+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.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+******************************
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+chalk
+5.3.0 <https://github.com/chalk/chalk>
+MIT License
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+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:
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+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.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+******************************
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-******************************
-
-@chainsafe/ssz
-0.9.4 <>
-Copyright 2019- ChainSafe Systems
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-
-
-******************************
-
-chalk
-2.4.2 <https://github.com/chalk/chalk>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-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.
-
-
-******************************
-
-chalk
-4.1.2 <https://github.com/chalk/chalk>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-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.
-
-
-******************************
-
-character-entities
-1.2.1 <https://github.com/wooorm/character-entities>
-(The MIT License)
+character-entities
+1.2.1 <https://github.com/wooorm/character-entities>
+(The MIT License)
 
 Copyright (c) 2015 Titus Wormer <tituswormer@gmail.com>
 
@@ -4175,6 +3866,21 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+******************************
+
+chart.js
+4.4.1 <https://github.com/chartjs/Chart.js>
+The MIT License (MIT)
+
+Copyright (c) 2014-2022 Chart.js Contributors
+
+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.
+
+
 ******************************
 
 cids
@@ -4504,7 +4210,7 @@ THE SOFTWARE.
 ******************************
 
 commander
-2.20.3 <https://github.com/tj/commander.js>
+12.1.0 <https://github.com/tj/commander.js>
 (The MIT License)
 
 Copyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>
@@ -4532,7 +4238,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 commander
-4.1.1 <https://github.com/tj/commander.js>
+2.20.3 <https://github.com/tj/commander.js>
 (The MIT License)
 
 Copyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>
@@ -4645,64 +4351,10 @@ 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.
 
-******************************
-
-contentful
-10.8.7 <https://github.com/contentful/contentful.js>
-The MIT License (MIT)
-
-Copyright (c) 2016 Contentful
-
-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.
-
-
-******************************
-
-contentful-resolve-response
-1.8.1 <https://github.com/contentful/contentful-resolve-response>
-MIT License
-
-Copyright (c) 2018 Contentful
-
-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.
-
-
 ******************************
 
 @contentful/rich-text-html-renderer
-16.3.5 <https://github.com/contentful/rich-text>
+16.6.8 <https://github.com/contentful/rich-text>
 MIT License
 
 Copyright (c) 2018 Contentful
@@ -4729,7 +4381,7 @@ SOFTWARE.
 ******************************
 
 @contentful/rich-text-types
-16.3.5 <https://github.com/contentful/rich-text>
+16.8.3 <https://github.com/contentful/rich-text>
 MIT License
 
 Copyright (c) 2018 Contentful
@@ -4753,33 +4405,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-contentful-sdk-core
-8.1.2 <https://github.com/contentful/contentful-sdk-core>
-The MIT License (MIT)
-
-Copyright (c) 2016 Contentful
-
-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.
-
-
 ******************************
 
 convert-source-map
@@ -4892,12 +4517,200 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 crc-32
-1.2.0 <https://github.com/SheetJS/js-crc32>
-Copyright (C) 2014-present  SheetJS
+1.2.2 <https://github.com/SheetJS/js-crc32>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (C) 2014-present   SheetJS LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
@@ -4908,7 +4721,6 @@ Copyright (C) 2014-present  SheetJS
    limitations under the License.
 
 
-
 ******************************
 
 create-hash
@@ -5044,33 +4856,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
@@ -5265,7 +5050,7 @@ THE SOFTWARE.
 ******************************
 
 debug
-4.3.4 <https://github.com/debug-js/debug>
+4.3.5 <https://github.com/debug-js/debug>
 (The MIT License)
 
 Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
@@ -5364,7 +5149,7 @@ THE SOFTWARE.
 ******************************
 
 define-data-property
-1.1.2 <https://github.com/ljharb/define-data-property>
+1.1.4 <https://github.com/ljharb/define-data-property>
 MIT License
 
 Copyright (c) 2023 Jordan Harband
@@ -5454,34 +5239,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-******************************
-
-delimit-stream
-0.1.0 <https://github.com/jasonkuhrt/delimit-stream>
-Copyright (c) 2013, Jason Kuhrt
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ******************************
 
 detect-browser
@@ -5597,13 +5354,6 @@ authors: Raynos <raynos2@gmail.com>
 
 ******************************
 
-eastasianwidth
-0.2.0 <https://github.com/komagata/eastasianwidth>
-license: MIT
-authors: Masaki Komagata
-
-******************************
-
 ecdsa-sig-formatter
 1.0.11 <https://github.com/Brightspace/node-ecdsa-sig-formatter>
 Apache License
@@ -5811,11 +5561,11 @@ Apache License
 
 ******************************
 
-eciesjs
-0.3.16 <https://github.com/ecies/js>
+eip55
+2.1.1 <https://github.com/cryptocoinjs/eip55>
 MIT License
 
-Copyright (c) 2019-2022 Weiliang Li
+Copyright (c) 2018 Daniel Cousens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -5839,7 +5589,7 @@ SOFTWARE.
 ******************************
 
 electron-to-chromium
-1.4.715 <https://github.com/kilian/electron-to-chromium>
+1.5.45 <https://github.com/kilian/electron-to-chromium>
 Copyright 2018 Kilian Valkhof
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
@@ -5850,7 +5600,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 ******************************
 
 elliptic
-6.5.4 <https://github.com/indutny/elliptic>
+6.5.7 <https://github.com/indutny/elliptic>
 license: MIT
 authors: Fedor Indutny <fedor@indutny.com>
 
@@ -5882,37 +5632,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-emoji-regex
-9.2.2 <https://github.com/mathiasbynens/emoji-regex>
-Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-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:
+@emotion/hash
+0.8.0 <https://github.com/emotion-js/emotion/tree/master/packages/hash>
+MIT License
 
-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.
-
-
-******************************
-
-@emotion/hash
-0.8.0 <https://github.com/emotion-js/emotion/tree/master/packages/hash>
-MIT License
-
-Copyright (c) Emotion team and other contributors
+Copyright (c) Emotion team and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6222,32 +5946,6 @@ SOFTWARE.
    limitations under the License.
 
 
-******************************
-
-end-of-stream
-1.4.4 <https://github.com/mafintosh/end-of-stream>
-The MIT License (MIT)
-
-Copyright (c) 2014 Mathias Buus
-
-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.
-
 ******************************
 
 @ensdomains/content-hash
@@ -6303,7 +6001,7 @@ authors: Mike Hall <mikehall314@gmail.com>
 ******************************
 
 escalade
-3.1.1 <https://github.com/lukeed/escalade>
+3.2.0 <https://github.com/lukeed/escalade>
 MIT License
 
 Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
@@ -6372,6 +6070,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+******************************
+
+es-define-property
+1.0.0 <https://github.com/ljharb/es-define-property>
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+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.
+
+
 ******************************
 
 es-errors
@@ -6771,10 +6496,29 @@ eslint-visitor-keys
 
 ******************************
 
-eth-eip712-util-browser
-0.0.3 <https://github.com/GridPlus/eth-eip712-util>
-license: ISC
-authors: Dan Finlay
+eth-chainlist
+0.0.519 <https://github.com/poowf/eth-chainlist>
+The MIT License (MIT)
+
+Copyright (c) 2022 Zane J. Chua
+
+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.
 
 ******************************
 
@@ -6818,33 +6562,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 ethereum-cryptography
-1.1.2 <https://github.com/ethereum/js-ethereum-cryptography>
-The MIT License (MIT)
-
-Copyright (c) 2021 Patricio Palladino, Paul Miller, ethereum-cryptography contributors
-
-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.
-
-******************************
-
-ethereum-cryptography
-2.1.3 <https://github.com/ethereum/js-ethereum-cryptography>
+2.2.1 <https://github.com/ethereum/js-ethereum-cryptography>
 The MIT License (MIT)
 
 Copyright (c) 2021 Patricio Palladino, Paul Miller, ethereum-cryptography contributors
@@ -6869,15 +6587,8 @@ THE SOFTWARE.
 
 ******************************
 
-ethereum-ens-network-map
-1.0.2 <https://github.com/flyswatter/ethereum-ens-network-map>
-license: ISC
-authors: Dan Finlay
-
-******************************
-
 @ethereumjs/common
-3.1.1 <https://github.com/ethereumjs/ethereumjs-monorepo>
+3.2.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 The MIT License (MIT)
 
 Copyright (c) 2015 
@@ -6905,7 +6616,7 @@ SOFTWARE.
 ******************************
 
 @ethereumjs/common
-3.2.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
+4.3.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 The MIT License (MIT)
 
 Copyright (c) 2015 
@@ -6933,7 +6644,7 @@ SOFTWARE.
 ******************************
 
 @ethereumjs/common
-4.3.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
+4.4.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 The MIT License (MIT)
 
 Copyright (c) 2015 
@@ -7719,7 +7430,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 @ethereumjs/tx
-4.1.1 <https://github.com/ethereumjs/ethereumjs-monorepo>
+4.2.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 Mozilla Public License Version 2.0
 ==================================
 
@@ -8098,7 +7809,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 @ethereumjs/tx
-4.2.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
+5.3.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 Mozilla Public License Version 2.0
 ==================================
 
@@ -8477,7 +8188,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 @ethereumjs/tx
-5.3.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
+5.4.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 Mozilla Public License Version 2.0
 ==================================
 
@@ -9235,7 +8946,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 @ethereumjs/util
-9.0.3 <https://github.com/ethereumjs/ethereumjs-monorepo>
+9.1.0 <https://github.com/ethereumjs/ethereumjs-monorepo>
 Mozilla Public License Version 2.0
 ==================================
 
@@ -10017,6 +9728,60 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+ethers
+5.7.2 <https://github.com/ethers-io/ethers.js>
+MIT License
+
+Copyright (c) 2019 Richard Moore
+
+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.
+
+
+******************************
+
+ethers
+6.13.2 <https://github.com/ethers-io/ethers.js>
+MIT License
+
+Copyright (c) 2016-2023 Richard Moore
+
+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.
+
+
 ******************************
 
 @ethersproject/abi
@@ -10351,6 +10116,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+@ethersproject/json-wallets
+5.7.0 <https://github.com/ethers-io/ethers.js>
+MIT License
+
+Copyright (c) 2019 Richard Moore
+
+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.
+
+
 ******************************
 
 @ethersproject/keccak256
@@ -10603,7 +10395,7 @@ SOFTWARE.
 
 ******************************
 
-@ethersproject/strings
+@ethersproject/solidity
 5.7.0 <https://github.com/ethers-io/ethers.js>
 MIT License
 
@@ -10630,7 +10422,7 @@ SOFTWARE.
 
 ******************************
 
-@ethersproject/transactions
+@ethersproject/strings
 5.7.0 <https://github.com/ethers-io/ethers.js>
 MIT License
 
@@ -10657,8 +10449,8 @@ SOFTWARE.
 
 ******************************
 
-@ethersproject/web
-5.7.1 <https://github.com/ethers-io/ethers.js>
+@ethersproject/transactions
+5.7.0 <https://github.com/ethers-io/ethers.js>
 MIT License
 
 Copyright (c) 2019 Richard Moore
@@ -10684,7 +10476,7 @@ SOFTWARE.
 
 ******************************
 
-@ethersproject/wordlists
+@ethersproject/units
 5.7.0 <https://github.com/ethers-io/ethers.js>
 MIT License
 
@@ -10711,11 +10503,11 @@ SOFTWARE.
 
 ******************************
 
-ethjs-abi
-0.2.1 <https://github.com/ethjs/ethjs-abi>
-The MIT License (MIT)
+@ethersproject/wallet
+5.7.0 <https://github.com/ethers-io/ethers.js>
+MIT License
 
-Copyright (c) 2016 Nick Dodson
+Copyright (c) 2019 Richard Moore
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10724,25 +10516,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-ethjs-schema
-0.2.1 <https://github.com/ethjs/ethjs-schema>
-The MIT License
+@ethersproject/web
+5.7.1 <https://github.com/ethers-io/ethers.js>
+MIT License
 
-Copyright (c) 2016 Nick Dodson. nickdodson.com
+Copyright (c) 2019 Richard Moore
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10751,25 +10543,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-eth-lattice-keyring
-0.12.4 <https://github.com/GridPlus/eth-lattice-keyring>
+@ethersproject/wordlists
+5.7.0 <https://github.com/ethers-io/ethers.js>
 MIT License
 
-Copyright (c) 2021 GridPlus
+Copyright (c) 2019 Richard Moore
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10792,64 +10584,65 @@ SOFTWARE.
 
 ******************************
 
-eth-method-registry
-4.0.0 <https://github.com/MetaMask/eth-method-registry>
-ISC License
+ethjs-abi
+0.2.1 <https://github.com/ethjs/ethjs-abi>
+The MIT License (MIT)
 
-Copyright (c) 2020 MetaMask
+Copyright (c) 2016 Nick Dodson
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-eth-phishing-detect
-1.2.0 <https://github.com/MetaMask/eth-phishing-detect>
-# DON'T BE A DICK PUBLIC LICENSE
+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:
 
-> Version 1.1, December 2016
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-> Copyright (C) 2018 kumavis
+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.
 
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document.
 
-> DON'T BE A DICK PUBLIC LICENSE
-> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+******************************
 
-1. Do whatever you like with the original work, just don't be a dick.
+ethjs-schema
+0.2.1 <https://github.com/ethjs/ethjs-schema>
+The MIT License
 
-   Being a dick includes - but is not limited to - the following instances:
+Copyright (c) 2016 Nick Dodson. nickdodson.com
 
- 1a. Outright copyright infringement - Don't just copy this and change the name.
- 1b. Selling the unmodified original with no work done what-so-ever, that's REALLY being a dick.
- 1c. Modifying the original work to contain hidden harmful content. That would make you a PROPER dick.
+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:
 
-2. If you become rich through modifications, related works/services, or supporting the original work,
-share the love. Only a dick would make loads off this work and not buy the original work's
-creator(s) a pint.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-3. Code is provided with no warranty. Using somebody else's code and bitching when it goes wrong makes
-you a DONKEY dick. Fix the problem yourself. A non-dick would submit the fix back.
+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.
 
 
 ******************************
 
-eth-rpc-errors
-4.0.3 <https://github.com/MetaMask/eth-rpc-errors>
+eth-lattice-keyring
+0.12.4 <https://github.com/GridPlus/eth-lattice-keyring>
 MIT License
 
-Copyright (c) 2019 MetaMask
+Copyright (c) 2021 GridPlus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10870,6 +10663,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+eth-method-registry
+4.0.0 <https://github.com/MetaMask/eth-method-registry>
+ISC License
+
+Copyright (c) 2020 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
 ******************************
 
 eventemitter3
@@ -10982,86 +10796,108 @@ SOFTWARE.
 
 ******************************
 
-exit-on-epipe
-1.0.1 <https://github.com/SheetJS/node-exit-on-epipe>
-Copyright (C) 2015-present SheetJS
+extend
+3.0.2 <https://github.com/justmoon/node-extend>
+The MIT License (MIT)
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Copyright (c) 2014 Stefan Thomas
 
-       http://www.apache.org/licenses/LICENSE-2.0
+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:
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+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.
 
-******************************
 
-@expo/config
-8.5.6 <https://github.com/expo/expo>
-The MIT License (MIT)
 
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+******************************
 
-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:
+extension-port-stream
+3.0.0 <git+https://git@github.com/MetaMask/extension-port-stream>
+ISC License
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Copyright (c) 2020 MetaMask
 
-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.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 ******************************
 
-@expo/config-plugins
-7.9.2 <https://github.com/expo/expo>
-The MIT License (MIT)
+extension-port-stream
+4.2.0 <git+https://git@github.com/MetaMask/extension-port-stream>
+ISC License
 
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+Copyright (c) 2020 MetaMask
 
-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:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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.
 
+******************************
+
+eyes
+0.1.8 <>
+Copyright (c) 2009 cloudhead
+
+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.
 
 
 ******************************
 
-@expo/config-types
-50.0.1 <https://github.com/expo/expo>
-The MIT License (MIT)
+fast-deep-equal
+3.1.3 <https://github.com/epoberezkin/fast-deep-equal>
+MIT License
 
-Copyright (c) 2020-present 650 Industries, Inc. (aka Expo)
+Copyright (c) 2017 Evgeny Poberezkin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -11082,21 +10918,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-
-******************************
-
-expo-constants
-15.4.5 <https://github.com/expo/expo>
-license: MIT
-authors: 650 Industries, Inc.
-
 ******************************
 
-@expo/fingerprint
-0.6.1 <https://github.com/expo/expo>
-The MIT License (MIT)
+fastest-levenshtein
+1.0.16 <https://github.com/ka-weihe/fastest-levenshtein>
+MIT License
 
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+Copyright (c) 2020 Kasper Unn Weihe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -11116,15 +10944,13 @@ 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.
 
-
-
 ******************************
 
-@expo/json-file
-8.3.3 <https://github.com/expo/expo>
+fast-fifo
+1.3.2 <https://github.com/mafintosh/fast-fifo>
 The MIT License (MIT)
 
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+Copyright (c) 2019 Mathias Buus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -11133,270 +10959,49 @@ 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 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.
-
-
-
-******************************
-
-@expo/plist
-0.1.3 <https://github.com/expo/expo>
-license: MIT
-authors: undefined
-
-******************************
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
-@expo/sdk-runtime-versions
-1.0.0 <>
-license: MIT
-authors: Expo <support@expo.io>
 
 ******************************
 
-@expo/spawn-async
-1.7.2 <https://github.com/expo/spawn-async>
-The MIT License (MIT)
-
-Copyright (c) 2015 650 Industries
+@fastify/busboy
+2.1.1 <https://github.com/fastify/busboy>
+Copyright Brian White. All rights reserved.
 
 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
+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 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.
-
-
+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.
 
 ******************************
 
-extend
-3.0.2 <https://github.com/justmoon/node-extend>
-The MIT License (MIT)
+fast-json-patch
+3.1.1 <https://github.com/Starcounter-Jack/JSON-Patch>
+(The MIT License)
 
-Copyright (c) 2014 Stefan Thomas
-
-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.
-
-
-
-******************************
-
-extension-port-stream
-2.1.1 <git+https://git@github.com/MetaMask/extension-port-stream>
-ISC License
-
-Copyright (c) 2020 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-extension-port-stream
-3.0.0 <git+https://git@github.com/MetaMask/extension-port-stream>
-ISC License
-
-Copyright (c) 2020 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-eyes
-0.1.8 <>
-Copyright (c) 2009 cloudhead
-
-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.
-
-
-******************************
-
-fast-copy
-2.1.7 <https://github.com/planttheidea/fast-copy>
-MIT License
-
-Copyright (c) 2018 Tony Quetano
-
-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.
-
-
-******************************
-
-fast-deep-equal
-3.1.3 <https://github.com/epoberezkin/fast-deep-equal>
-MIT License
-
-Copyright (c) 2017 Evgeny Poberezkin
-
-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.
-
-
-******************************
-
-fast-fifo
-1.3.2 <https://github.com/mafintosh/fast-fifo>
-The MIT License (MIT)
-
-Copyright (c) 2019 Mathias Buus
-
-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.
-
-
-******************************
-
-@fastify/busboy
-2.1.1 <https://github.com/fastify/busboy>
-Copyright Brian White. All rights reserved.
-
-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.
-
-******************************
-
-fast-json-patch
-3.1.1 <https://github.com/Starcounter-Jack/JSON-Patch>
-(The MIT License)
-
-Copyright (c) 2013, 2014, 2020 Joachim Wester
+Copyright (c) 2013, 2014, 2020 Joachim Wester
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -11445,37 +11050,6 @@ 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.
 
 
-******************************
-
-fast-levenshtein
-2.0.6 <https://github.com/hiddentao/fast-levenshtein>
-(MIT License)
-
-Copyright (c) 2013 [Ramesh Nair](http://www.hiddentao.com/)
-
-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.
-
-
-
 ******************************
 
 fast-safe-stringify
@@ -11535,7 +11109,7 @@ SOFTWARE.
 ******************************
 
 fast-xml-parser
-4.3.4 <https://github.com/NaturalIntelligence/fast-xml-parser>
+4.4.1 <https://github.com/NaturalIntelligence/fast-xml-parser>
 MIT License
 
 Copyright (c) 2017 Amit Kumar Gupta
@@ -11603,21 +11177,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-find-up
-5.0.0 <https://github.com/sindresorhus/find-up>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 firebase
@@ -11956,7 +11515,7 @@ SOFTWARE.
 ******************************
 
 follow-redirects
-1.15.6 <https://github.com/follow-redirects/follow-redirects>
+1.15.9 <https://github.com/follow-redirects/follow-redirects>
 Copyright 2014–present Olivier Lalonde <olalonde@gmail.com>, James Talmage <james@talmage.io>, Ruben Verborgh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -12005,27 +11564,6 @@ SOFTWARE.
 
 
 
-******************************
-
-foreground-child
-3.1.1 <https://github.com/tapjs/foreground-child>
-The ISC License
-
-Copyright (c) 2015-2023 Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 form-data
@@ -12351,214 +11889,6 @@ fuse.js
    limitations under the License.
 
 
-******************************
-
-futoin-hkdf
-1.5.1 <https://github.com/futoin/util-js-hkdf>
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
 ******************************
 
 gensync
@@ -12584,32 +11914,6 @@ Permission to use, copy, modify, and/or distribute this software for any purpose
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-******************************
-
-getenv
-1.0.0 <https://github.com/ctavan/node-getenv>
-The MIT License (MIT)
-Copyright (c) 2012-2019 Christoph Tavan <dev@tavan.de>
-
-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.
-
-
 ******************************
 
 get-intrinsic
@@ -12715,27 +12019,6 @@ freely, subject to the following restrictions:
 
  3. This notice may not be removed or altered from any source distribution.
 
-******************************
-
-glob
-10.4.1 <https://github.com/isaacs/node-glob>
-The ISC License
-
-Copyright (c) 2009-2023 Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 globals
@@ -12819,32 +12102,11 @@ SOFTWARE.
 
 ******************************
 
-graceful-fs
-4.2.11 <https://github.com/isaacs/node-graceful-fs>
-The ISC License
-
-Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
+gridplus-sdk
+2.7.1 <https://github.com/GridPlus/gridplus-sdk>
+MIT License
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-gridplus-sdk
-2.5.1 <https://github.com/GridPlus/gridplus-sdk>
-MIT License
-
-Copyright (c) 2019 GridPlus, Inc
+Copyright (c) 2019 GridPlus, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -12868,7 +12130,7 @@ SOFTWARE.
 ******************************
 
 @grpc/grpc-js
-1.9.14 <https://github.com/grpc/grpc-node/tree/master/packages/grpc-js>
+1.9.15 <https://github.com/grpc/grpc-node/tree/master/packages/grpc-js>
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -13279,13 +12541,6 @@ SOFTWARE.
    limitations under the License.
 
 
-******************************
-
-gud
-1.0.0 <https://github.com/jamiebuilds/global-unique-id>
-license: MIT
-authors: Jamie Kyle <me@thejameskyle.com>
-
 ******************************
 
 has-bigints
@@ -13380,7 +12635,7 @@ authors: Fedor Indutny <fedor@indutny.com>
 ******************************
 
 hasown
-2.0.0 <https://github.com/inspect-js/hasOwn>
+2.0.2 <https://github.com/inspect-js/hasOwn>
 MIT License
 
 Copyright (c) Jordan Harband and contributors
@@ -13407,7 +12662,7 @@ SOFTWARE.
 ******************************
 
 has-property-descriptors
-1.0.1 <https://github.com/inspect-js/has-property-descriptors>
+1.0.2 <https://github.com/inspect-js/has-property-descriptors>
 MIT License
 
 Copyright (c) 2022 Inspect JS
@@ -13434,7 +12689,7 @@ SOFTWARE.
 ******************************
 
 has-proto
-1.0.1 <https://github.com/inspect-js/has-proto>
+1.0.3 <https://github.com/inspect-js/has-proto>
 MIT License
 
 Copyright (c) 2022 Inspect JS
@@ -13488,7 +12743,7 @@ SOFTWARE.
 ******************************
 
 has-tostringtag
-1.0.0 <https://github.com/inspect-js/has-tostringtag>
+1.0.2 <https://github.com/inspect-js/has-tostringtag>
 MIT License
 
 Copyright (c) 2021 Inspect JS
@@ -13592,6 +12847,34 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+history
+5.3.0 <https://github.com/remix-run/history>
+MIT License
+
+Copyright (c) React Training 2016-2020
+Copyright (c) Remix Software 2020-2021
+
+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.
+
+
 ******************************
 
 hmac-drbg
@@ -13637,7 +12920,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************
 
 http-parser-js
-0.4.9 <https://github.com/creationix/http-parser-js>
+0.5.8 <https://github.com/creationix/http-parser-js>
 Copyright (c) 2015 Tim Caswell (https://github.com/creationix) and other
 contributors. All rights reserved.
 
@@ -13982,13 +13265,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-imurmurhash
-0.1.4 <https://github.com/jensyt/imurmurhash-js>
-license: MIT
-authors: Jens Taylor <jensyt@gmail.com>
-
 ******************************
 
 inherits
@@ -14049,7 +13325,7 @@ SOFTWARE.
 ******************************
 
 internal-slot
-1.0.6 <https://github.com/ljharb/internal-slot>
+1.0.7 <https://github.com/ljharb/internal-slot>
 MIT License
 
 Copyright (c) 2019 Jordan Harband
@@ -14098,26 +13374,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-******************************
-
-@isaacs/cliui
-8.0.2 <https://github.com/yargs/cliui>
-Copyright (c) 2015, Contributors
-
-Permission to use, copy, modify, and/or distribute this software
-for any purpose with or without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 is-alphabetical
@@ -14244,7 +13500,7 @@ SOFTWARE.
 ******************************
 
 is-array-buffer
-3.0.2 <https://github.com/inspect-js/is-array-buffer>
+3.0.4 <https://github.com/inspect-js/is-array-buffer>
 MIT License
 
 Copyright (c) 2015 Chen Gengyuan, Inspect JS
@@ -14474,27 +13730,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-isexe
-2.0.0 <https://github.com/isaacs/isexe>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 is-fn
@@ -14735,7 +13970,7 @@ SOFTWARE.
 ******************************
 
 iso-url
-0.4.7 <https://github.com/hugomrdias/iso-url>
+1.2.1 <https://github.com/hugomrdias/iso-url>
 MIT License
 
 Copyright (c) Hugo Dias <hugomrdias@gmail.com> (hugodias.me)
@@ -14834,7 +14069,7 @@ SOFTWARE.
 ******************************
 
 is-shared-array-buffer
-1.0.2 <https://github.com/inspect-js/is-shared-array-buffer>
+1.0.3 <https://github.com/inspect-js/is-shared-array-buffer>
 MIT License
 
 Copyright (c) 2021 Inspect JS
@@ -14932,7 +14167,7 @@ SOFTWARE.
 ******************************
 
 is-typed-array
-1.1.10 <https://github.com/inspect-js/is-typed-array>
+1.1.13 <https://github.com/inspect-js/is-typed-array>
 The MIT License (MIT)
 
 Copyright (c) 2015 Jordan Harband
@@ -15011,71 +14246,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-jackspeak
-3.1.2 <https://github.com/isaacs/jackspeak>
-# Blue Oak Model License
-
-Version 1.0.0
-
-## Purpose
-
-This license gives everyone as much permission to work with
-this software as possible, while protecting contributors
-from liability.
-
-## Acceptance
-
-In order to receive this license, you must agree to its
-rules.  The rules of this license are both obligations
-under that agreement and conditions to your license.
-You must not do anything with this software that triggers
-a rule that you cannot or will not follow.
-
-## Copyright
-
-Each contributor licenses you to do everything with this
-software that would otherwise infringe that contributor's
-copyright in it.
-
-## Notices
-
-You must ensure that everyone who gets a copy of
-any part of this software from you, with or without
-changes, also gets the text of this license or a link to
-<https://blueoakcouncil.org/license/1.0.0>.
-
-## Excuse
-
-If anyone notifies you in writing that you have not
-complied with [Notices](#notices), you can keep your
-license by taking all practical steps to comply within 30
-days after the notice.  If you do not do so, your license
-ends immediately.
-
-## Patent
-
-Each contributor licenses you to do everything with this
-software that would otherwise infringe any patent claims
-they can license or become able to license.
-
-## Reliability
-
-No contributor can revoke this license.
-
-## No Liability
-
-***As far as the law allows, this software comes as is,
-without any warranty or condition, and no contributor
-will be liable to anyone for any damages related to this
-software or this license, under any kind of legal claim.***
-
-
 ******************************
 
 jayson
-4.1.0 <https://github.com/tedeh/jayson>
+4.1.1 <https://github.com/tedeh/jayson>
 (The MIT License)
 
 Copyright (c) 2011-2012 Tedde Lundgren <mail@tedeh.net>
@@ -15758,7 +14932,7 @@ Address all questions regarding this license to:
 ******************************
 
 jsesc
-2.5.2 <https://github.com/mathiasbynens/jsesc>
+3.0.2 <https://github.com/mathiasbynens/jsesc>
 Copyright Mathias Bynens <https://mathiasbynens.be/>
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -15810,13 +14984,6 @@ SOFTWARE.
 [others]: https://github.com/json5/json5/contributors
 
 
-******************************
-
-jsonify
-0.0.1 <https://github.com/ljharb/jsonify>
-license: Public Domain
-authors: Douglas Crockford <https://crockford.com/>
-
 ******************************
 
 jsonparse
@@ -15847,27 +15014,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-json-rpc-engine
-6.1.0 <https://github.com/MetaMask/json-rpc-engine>
-ISC License
-
-Copyright (c) 2020 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 json-rpc-middleware-stream
@@ -15950,33 +15096,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-json-stable-stringify
-1.1.1 <https://github.com/ljharb/json-stable-stringify>
-MIT License
-
-Copyright (c) 2013 contributors
-
-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.
-
-
 ******************************
 
 JSONStream
@@ -16022,7 +15141,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 json-text-sequence
-0.1.1 <https://github.com/hildjj/json-text-sequence>
+0.3.0 <https://github.com/hildjj/json-text-sequence>
 The MIT License (MIT)
 
 Copyright (c) 2014 Joe Hildebrand
@@ -16086,38 +15205,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-jssha
-3.2.0 <https://github.com/Caligatio/jsSHA>
-Copyright (c) 2008-2020 Brian Turek, 1998-2009 Paul Johnston & Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- * Neither the name of the the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
 ******************************
 
 js-sha3
@@ -16318,7 +15405,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
 ******************************
 
 keccak
-3.0.2 <https://github.com/cryptocoinjs/keccak>
+3.0.4 <https://github.com/cryptocoinjs/keccak>
 The MIT License (MIT)
 
 Copyright (c) 2016-2019 https://github.com/cryptocoinjs/keccak contributors
@@ -16593,7 +15680,7 @@ authors: soralit <soralitria@gmail.com>
 ******************************
 
 @keystonehq/metamask-airgapped-keyring
-0.13.1 <https://github.com/KeystoneHQ/keystone-airgaped-base>
+0.14.1 <https://github.com/KeystoneHQ/keystone-airgaped-base>
 license: MIT
 authors: aaronisme <aarondongchen@gmail.com>
 
@@ -16612,6 +15699,21 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
+******************************
+
+@kurkle/color
+0.3.2 <https://github.com/kurkle/color>
+The MIT License (MIT)
+
+Copyright (c) 2018-2021 Jukka Kurkela
+
+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.
+
+
 ******************************
 
 @kwsites/file-exists
@@ -16724,7 +15826,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ******************************
 
 @lavamoat/snow
-2.0.1 <https://github.com/lavamoat/snow>
+2.0.2 <https://github.com/lavamoat/snow>
 The MIT License (MIT)
 
 Copyright (c) 2020 Consensys Software
@@ -16738,23 +15840,38 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ******************************
 
-lie
-3.1.1 <https://github.com/calvinmetcalf/lie>
-#Copyright (c) 2014 Calvin Metcalf 
+@ledgerhq/cryptoassets-evm-signatures
+13.5.0 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
 
-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:
+Copyright (c) 2017-present Ledger https://www.ledger.com/
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+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.
 
-**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.**
 
 ******************************
 
-lines-and-columns
-1.1.6 <https://github.com/eventualbuddha/lines-and-columns>
-The MIT License (MIT)
+@ledgerhq/devices
+8.4.4 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
 
-Copyright (c) 2015 Brian Donovan
+Copyright (c) 2017-present Ledger https://www.ledger.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16777,35 +15894,270 @@ THE SOFTWARE.
 
 ******************************
 
-locale-currency
-0.0.1 <https://github.com/tadeegan/locale-currency>
-license: BSD-2-Clause
-authors: Thomas Deegan <tadeegan@gmail.com>
+@ledgerhq/domain-service
+1.2.6 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
 
-******************************
+Copyright (c) 2017-present Ledger https://www.ledger.com/
 
-localforage
-1.10.0 <https://github.com/localForage/localForage>
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+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:
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-   1. Definitions.
+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.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+******************************
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+@ledgerhq/errors
+6.19.1 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/evm-tools
+1.2.3 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/hw-app-eth
+6.39.0 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/hw-transport
+6.31.4 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/hw-transport-mocker
+6.29.4 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/live-env
+2.3.0 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+@ledgerhq/logs
+6.12.0 <https://github.com/LedgerHQ/ledger-live>
+license: Apache-2.0
+authors: undefined
+
+******************************
+
+@ledgerhq/types-live
+6.52.0 <https://github.com/LedgerHQ/ledger-live>
+The MIT License
+
+Copyright (c) 2017-present Ledger https://www.ledger.com/
+
+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.
+
+
+******************************
+
+lie
+3.1.1 <https://github.com/calvinmetcalf/lie>
+#Copyright (c) 2014 Calvin Metcalf 
+
+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.**
+
+******************************
+
+locale-currency
+0.0.1 <https://github.com/tadeegan/locale-currency>
+license: BSD-2-Clause
+authors: Thomas Deegan <tadeegan@gmail.com>
+
+******************************
+
+localforage
+1.10.0 <https://github.com/localForage/localForage>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
       outstanding shares, or (iii) beneficial ownership of such entity.
 
       "You" (or "Your") shall mean an individual or Legal Entity
@@ -16989,21 +16341,6 @@ localforage
    limitations under the License.
 
 
-******************************
-
-locate-path
-6.0.0 <https://github.com/sindresorhus/locate-path>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 lodash
@@ -17165,111 +16502,30 @@ terms above.
 
 ******************************
 
-lodash.isplainobject
-4.0.6 <https://github.com/lodash/lodash>
-Copyright jQuery Foundation and other contributors <https://jquery.org/>
+loglevel
+1.9.1 <https://github.com/pimterry/loglevel>
+Copyright (c) 2013 Tim Perry
 
-Based on Underscore.js, copyright Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+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:
 
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/lodash/lodash
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-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.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules and vendor directories are externally
-maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
-
-
-******************************
-
-lodash.isstring
-4.0.1 <https://github.com/lodash/lodash>
-Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js, copyright 2009-2016 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-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.
-
-
-******************************
-
-loglevel
-1.9.1 <https://github.com/pimterry/loglevel>
-Copyright (c) 2013 Tim Perry
-
-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.
+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.
 
 
 ******************************
@@ -17717,24 +16973,29 @@ THE SOFTWARE.
 
 ******************************
 
-lru-cache
-10.2.2 <https://github.com/isaacs/node-lru-cache>
-The ISC License
+lottie-web
+5.12.2 <https://github.com/airbnb/lottie-web>
+The MIT License (MIT)
 
-Copyright (c) 2010-2023 Isaac Z. Schlueter and Contributors
+Copyright (c) 2015 Bodymovin
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+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.
 
 ******************************
 
@@ -17757,27 +17018,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-******************************
-
-lru-cache
-6.0.0 <https://github.com/isaacs/node-lru-cache>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 luxon
@@ -18182,14 +17422,14 @@ authors: Egor Gumenyuk <boo1ean0807@gmail.com>
 ******************************
 
 @metamask/abi-utils
-2.0.2 <https://github.com/MetaMask/abi-utils>
+2.0.4 <https://github.com/MetaMask/abi-utils>
 license: (Apache-2.0 AND MIT)
 authors: Maarten Zuidhoorn <maarten@zuidhoorn.com>
 
 ******************************
 
 @metamask/accounts-controller
-14.0.0 <https://github.com/MetaMask/core>
+17.2.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18214,8 +17454,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/address-book-controller
-4.0.1 <https://github.com/MetaMask/core>
+@metamask/accounts-controller
+18.2.2 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18240,65 +17480,220 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/announcement-controller
-6.1.0 <https://github.com/MetaMask/core>
-MIT License
+@metamask/account-watcher
+4.1.1 <https://github.com/metamask/snap-watch-only>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2018 MetaMask
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-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:
+   1. Definitions.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-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
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-******************************
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-@metamask/approval-controller
-6.0.2 <https://github.com/MetaMask/core>
-MIT License
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-Copyright (c) 2018 MetaMask
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-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:
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-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
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-******************************
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-@metamask/approval-controller
-7.0.0 <https://github.com/MetaMask/core>
-MIT License
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-Copyright (c) 2018 MetaMask
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2022 ConsenSys Software Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@metamask/address-book-controller
+6.0.0 <https://github.com/MetaMask/core>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+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
@@ -18318,8 +17713,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/assets-controllers
-29.0.0 <https://github.com/MetaMask/core>
+@metamask/announcement-controller
+7.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18344,8 +17739,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/base-controller
-3.2.3 <https://github.com/MetaMask/core>
+@metamask/approval-controller
+7.1.1 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18370,8 +17765,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/base-controller
-4.1.1 <https://github.com/MetaMask/core>
+@metamask/assets-controllers
+43.1.1 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18423,7 +17818,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/base-controller
-6.0.0 <https://github.com/MetaMask/core>
+6.0.3 <https://github.com/MetaMask/core>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+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
+
+
+******************************
+
+@metamask/base-controller
+7.0.2 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18446,6 +17867,13 @@ 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
 
 
+******************************
+
+@metamask/bitcoin-wallet-snap
+0.8.2 <https://github.com/MetaMask/snap-bitcoin-wallet>
+license: (MIT-0 OR Apache-2.0)
+authors: undefined
+
 ******************************
 
 @metamask/browser-passworder
@@ -18491,59 +17919,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/controller-utils
-11.0.0 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
-
-@metamask/controller-utils
-8.0.4 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
-
-@metamask/controller-utils
-9.1.0 <https://github.com/MetaMask/core>
+11.4.3 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18569,14 +17945,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/design-tokens
-3.0.0 <https://github.com/MetaMask/design-tokens>
+4.0.0 <https://github.com/MetaMask/design-tokens>
 license: MIT
 authors: undefined
 
 ******************************
 
-@metamask/desktop
-0.3.0 <https://github.com/MetaMask/metamask-desktop>
+@metamask/ens-controller
+13.0.1 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18597,44 +17973,276 @@ 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.
 
 
 ******************************
 
-@metamask/ens-controller
-10.0.1 <https://github.com/MetaMask/core>
-MIT License
+@metamask/ens-resolver-snap
+0.1.2 <https://github.com/MetaMask/ens-resolver-snap>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2018 MetaMask
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-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:
+   1. Definitions.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-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
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-******************************
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-@metamask/eth-block-tracker
-9.0.3 <https://github.com/MetaMask/eth-block-tracker>
-MIT License
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-Copyright (c) 2018 MetaMask
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2024 ConsenSys Software Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@metamask/eth-block-tracker
+10.0.0 <https://github.com/MetaMask/eth-block-tracker>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+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
+
+
+******************************
+
+@metamask/eth-block-tracker
+11.0.1 <https://github.com/MetaMask/eth-block-tracker>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+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
+
+
+******************************
+
+@metamask/eth-block-tracker
+9.0.3 <https://github.com/MetaMask/eth-block-tracker>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+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
@@ -18676,7 +18284,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-hd-keyring
-7.0.1 <https://github.com/MetaMask/eth-hd-keyring>
+7.0.4 <https://github.com/MetaMask/eth-hd-keyring>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -18805,7 +18413,7 @@ THE SOFTWARE.
 ******************************
 
 @metamask/eth-json-rpc-filters
-7.0.0 <https://github.com/MetaMask/eth-json-rpc-filters>
+9.0.0 <https://github.com/MetaMask/eth-json-rpc-filters>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -18847,7 +18455,28 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-json-rpc-middleware
-12.1.1 <https://github.com/MetaMask/eth-json-rpc-middleware>
+13.0.0 <https://github.com/MetaMask/eth-json-rpc-middleware>
+ISC License
+
+Copyright (c) 2020 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+@metamask/eth-json-rpc-middleware
+14.0.1 <https://github.com/MetaMask/eth-json-rpc-middleware>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -18909,14 +18538,35 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************
 
-@metamask/ethjs-provider-http
-0.3.0 <git+https://git@github.com/MetaMask/ethjs-provider-http>
-The MIT License
+@metamask/eth-json-rpc-provider
+4.1.3 <https://github.com/MetaMask/core>
+ISC License
 
-Copyright (c) 2016 Nick Dodson. nickdodson.com
+Copyright (c) 2022 MetaMask
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+@metamask/ethjs-provider-http
+0.3.0 <git+https://git@github.com/MetaMask/ethjs-provider-http>
+The MIT License
+
+Copyright (c) 2016 Nick Dodson. nickdodson.com
+
+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
@@ -19045,7 +18695,7 @@ THE SOFTWARE.
 ******************************
 
 @metamask/eth-ledger-bridge-keyring
-2.0.1 <https://github.com/MetaMask/eth-ledger-bridge-keyring>
+5.0.1 <https://github.com/MetaMask/eth-ledger-bridge-keyring>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -19066,21 +18716,35 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-query
-3.0.1 <https://github.com/MetaMask/eth-query>
+4.0.0 <https://github.com/MetaMask/eth-query>
 license: ISC
 authors: undefined
 
 ******************************
 
-@metamask/eth-query
-4.0.0 <https://github.com/MetaMask/eth-query>
-license: ISC
-authors: undefined
+@metamask/eth-sig-util
+7.0.3 <https://github.com/MetaMask/eth-sig-util>
+ISC License
+
+Copyright (c) 2020 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 
 ******************************
 
 @metamask/eth-sig-util
-7.0.1 <https://github.com/MetaMask/eth-sig-util>
+8.0.0 <https://github.com/MetaMask/eth-sig-util>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -19101,7 +18765,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-simple-keyring
-6.0.1 <https://github.com/MetaMask/eth-simple-keyring>
+6.0.5 <https://github.com/MetaMask/eth-simple-keyring>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -19122,7 +18786,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-snap-keyring
-4.2.1 <https://github.com/MetaMask/eth-snap-keyring>
+4.4.0 <https://github.com/MetaMask/eth-snap-keyring>
 license: Custom: https://metamask.github.io/eth-snap-keyring/latest/
 authors: undefined
 
@@ -19150,7 +18814,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/eth-trezor-keyring
-3.1.0 <https://github.com/MetaMask/eth-trezor-keyring>
+3.1.3 <https://github.com/MetaMask/eth-trezor-keyring>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -19171,33 +18835,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/gas-fee-controller
-15.1.2 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
-
-@metamask/gas-fee-controller
-17.0.0 <https://github.com/MetaMask/core>
+18.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -19250,7 +18888,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/custody-controller
-0.2.27 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.3.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19277,7 +18915,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/custody-keyring
-2.0.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
+2.1.1 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19304,7 +18942,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/extension
-0.3.24 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.3.28 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19331,7 +18969,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/institutional-features
-1.3.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+1.3.6 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19412,7 +19050,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/sdk
-0.1.27 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19466,7 +19104,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/transaction-update
-0.2.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.6 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19493,7 +19131,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/types
-1.1.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
+1.2.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19520,7 +19158,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/websocket-client
-0.2.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.6 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19565,6 +19203,27 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+******************************
+
+@metamask/json-rpc-engine
+10.0.1 <https://github.com/MetaMask/core>
+ISC License
+
+Copyright (c) 2022 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
 ******************************
 
 @metamask/json-rpc-engine
@@ -19607,10 +19266,31 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+******************************
+
+@metamask/json-rpc-engine
+9.0.3 <https://github.com/MetaMask/core>
+ISC License
+
+Copyright (c) 2022 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
 ******************************
 
 @metamask/json-rpc-middleware-stream
-7.0.1 <https://github.com/MetaMask/core>
+8.0.5 <https://github.com/MetaMask/core>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -19631,21 +19311,21 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/keyring-api
-5.1.0 <https://github.com/MetaMask/keyring-api>
+8.1.3 <https://github.com/MetaMask/keyring-api>
 license: Custom: https://docs.metamask.io/snaps/
 authors: undefined
 
 ******************************
 
 @metamask/keyring-api
-6.3.1 <https://github.com/MetaMask/keyring-api>
+9.0.0 <https://github.com/MetaMask/keyring-api>
 license: Custom: https://docs.metamask.io/snaps/
 authors: undefined
 
 ******************************
 
 @metamask/keyring-controller
-15.0.0 <https://github.com/MetaMask/core>
+17.2.2 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -19671,7 +19351,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/key-tree
-9.1.1 <https://github.com/MetaMask/key-tree>
+9.1.2 <https://github.com/MetaMask/key-tree>
 MIT License
 
 Copyright (c) 2021 MetaMask
@@ -19698,7 +19378,7 @@ SOFTWARE.
 ******************************
 
 @metamask/logging-controller
-3.0.1 <https://github.com/MetaMask/core>
+6.0.0 <https://github.com/MetaMask/core>
 license: MIT
 authors: undefined
 
@@ -19726,33 +19406,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/message-manager
-7.3.9 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
-
-@metamask/message-manager
-8.0.2 <https://github.com/MetaMask/core>
+10.1.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -19778,7 +19432,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/message-signing-snap
-0.3.3 <https://github.com/MetaMask/message-signing-snap>
+0.4.0 <https://github.com/MetaMask/message-signing-snap>
 license: Custom: http://localhost
 authors: undefined
 
@@ -19805,7 +19459,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/name-controller
-6.0.1 <https://github.com/MetaMask/core>
+8.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2023 MetaMask
@@ -19831,7 +19485,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/network-controller
-18.1.2 <https://github.com/MetaMask/core>
+21.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -19883,11 +19537,11 @@ SOFTWARE.
 
 ******************************
 
-@metamask/notification-controller
-3.0.0 <https://github.com/MetaMask/core>
+@metamask/nonce-tracker
+6.0.0 <https://github.com/MetaMask/nonce-tracker>
 MIT License
 
-Copyright (c) 2018 MetaMask
+Copyright (c) 2019 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19905,15 +19559,16 @@ 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.
 
 
 ******************************
 
-@metamask/number-to-bn
-1.7.1 <https://github.com/MetaMask/number-to-bn>
-The MIT License
+@metamask/notification-controller
+6.0.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) 2016 Nick Dodson. nickdodson.com
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19922,85 +19577,74 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 
 ******************************
 
-@metamask/object-multiplex
-2.0.0 <https://github.com/MetaMask/object-multiplex>
-ISC License
-
-Copyright (c) 2020 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
+@metamask/notification-services-controller
+0.11.0 <https://github.com/MetaMask/core>
+MIT License
 
-@metamask/obs-store
-5.0.0 <https://github.com/MetaMask/obs-store>
-ISC License
+Copyright (c) 2024 MetaMask
 
-Copyright (c) 2020 MetaMask
+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:
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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
 
 
 ******************************
 
-@metamask/obs-store
-7.0.0 <https://github.com/MetaMask/obs-store>
-ISC License
+@metamask/number-to-bn
+1.7.1 <https://github.com/MetaMask/number-to-bn>
+The MIT License
 
-Copyright (c) 2020 MetaMask
+Copyright (c) 2016 Nick Dodson. nickdodson.com
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+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.
 
 
 ******************************
 
-@metamask/obs-store
-8.1.0 <https://github.com/MetaMask/obs-store>
+@metamask/object-multiplex
+2.0.0 <https://github.com/MetaMask/object-multiplex>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -20042,7 +19686,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/permission-controller
-9.0.2 <https://github.com/MetaMask/core>
+10.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -20067,61 +19711,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/permission-log-controller
-2.0.1 <https://github.com/MetaMask/core>
-Copyright ConsenSys Software Inc. 2022. All rights reserved.
-
-You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
+@metamask/permission-controller
+11.0.3 <https://github.com/MetaMask/core>
+MIT License
 
-Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
-
-You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
- 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
- 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
-
-“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion:
- 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
- 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
- 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
-
-You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
-
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at communications@metamask.io.
-
-
-******************************
-
-@metamask/phishing-controller
-9.0.2 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
-
-@metamask/polling-controller
-6.0.2 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20143,62 +19737,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/polling-controller
-8.0.0 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2018 MetaMask
-
-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
-
-
-******************************
+@metamask/permission-log-controller
+2.0.1 <https://github.com/MetaMask/core>
+Copyright ConsenSys Software Inc. 2022. All rights reserved.
 
-@metamask/post-message-stream
-8.1.0 <https://github.com/MetaMask/post-message-stream>
-ISC License
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
 
-Copyright (c) 2020 MetaMask
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
+ 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+ 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion:
+ 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+ 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+ 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
 
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
 
-******************************
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at communications@metamask.io.
 
-@metamask/ppom-validator
-0.30.0 <https://github.com/MetaMask/ppom-validator>
-license: Custom: https://nodejs.org
-authors: undefined
 
 ******************************
 
-@metamask/preferences-controller
-11.0.0 <https://github.com/MetaMask/core>
+@metamask/phishing-controller
+12.3.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -20223,65 +19787,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/providers
-14.0.2 <https://github.com/MetaMask/providers>
-MIT License
-
-Copyright (c) 2020 MetaMask
-
-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.
-
-
-******************************
-
-@metamask/providers
-16.1.0 <https://github.com/MetaMask/providers>
-MIT License
-
-Copyright (c) 2020 MetaMask
-
-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.
-
-
-******************************
-
-@metamask/queued-request-controller
-0.10.0 <https://github.com/MetaMask/core>
+@metamask/polling-controller
+10.0.1 <https://github.com/MetaMask/core>
 MIT License
 
-Copyright (c) 2023 MetaMask
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20303,8 +19813,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/rate-limit-controller
-5.0.1 <https://github.com/MetaMask/core>
+@metamask/polling-controller
+12.0.1 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -20329,11 +19839,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/rpc-errors
-6.2.1 <https://github.com/MetaMask/rpc-errors>
+@metamask/polling-controller
+8.0.0 <https://github.com/MetaMask/core>
 MIT License
 
-Copyright (c) 2019 MetaMask
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20351,13 +19861,12 @@ 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.
 
 
 ******************************
 
-@metamask/safe-event-emitter
-2.0.0 <>
+@metamask/post-message-stream
+8.1.1 <https://github.com/MetaMask/post-message-stream>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -20377,227 +19886,53 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************
 
-@metamask/safe-event-emitter
-3.1.1 <https://github.com/MetaMask/safe-event-emitter>
-ISC License
-
-Copyright (c) 2020 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+@metamask/ppom-validator
+0.35.1 <https://github.com/MetaMask/ppom-validator>
+license: Custom: https://nodejs.org
+authors: undefined
 
 ******************************
 
-@metamask/scure-bip39
-2.1.1 <https://github.com/MetaMask/scure-bip39>
-The MIT License (MIT)
-
-Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
+@metamask/preinstalled-example-snap
+0.2.0 <https://github.com/MetaMask/snaps>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-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:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+   1. Definitions.
 
-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.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-******************************
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-@metamask/selected-network-controller
-13.0.0 <https://github.com/MetaMask/core>
-MIT License
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-Copyright (c) 2023 MetaMask
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-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:
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-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
-
-
-******************************
-
-@metamask/signature-controller
-14.0.1 <https://github.com/MetaMask/core>
-MIT License
-
-Copyright (c) 2023 MetaMask
-
-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
-
-
-******************************
-
-@metamask/slip44
-3.1.0 <https://github.com/MetaMask/slip44>
-license: ISC
-authors: Dan Finlay <dan@danfinlay.com>
-
-******************************
-
-@metamask/smart-transactions-controller
-10.0.1 <https://github.com/MetaMask/smart-transactions-controller>
-Copyright ConsenSys Software Inc. 2020. All rights reserved.
- 
-You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
- 
-Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
- 
-You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
- 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
- 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
- 
-“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
- 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
- 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
- 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
- 
-You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
- 
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
-
-
-******************************
-
-@metamask/snaps-controllers
-8.2.0 <https://github.com/MetaMask/snaps>
-Copyright ConsenSys Software Inc. 2021. All rights reserved.
- 
-You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
- 
-Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
- 
-You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
- 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
- 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
- 
-“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
- 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
- 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
- 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
- 
-You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
- 
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
-
-
-******************************
-
-@metamask/snaps-execution-environments
-6.2.0 <https://github.com/MetaMask/snaps>
-Copyright ConsenSys Software Inc. 2022. All rights reserved.
-
-You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
-
-Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
-
-You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
-
-1.  give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
-2.  subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
-
-“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion:
-
-1.  personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
-2.  use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
-3.  the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
-
-You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
-
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
-
-
-******************************
-
-@metamask/snaps-registry
-3.1.0 <https://github.com/MetaMask/snaps-registry>
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
       "Derivative Works" shall mean any work, whether in Source or Object
       form, that is based on (or derived from) the Work and for which the
@@ -20748,7 +20083,7 @@ If you have any questions, comments or interest in pursuing any other use cases,
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Consensys Software Inc.
+   Copyright 2024 Consensys Software Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20765,84 +20100,64 @@ If you have any questions, comments or interest in pursuing any other use cases,
 
 ******************************
 
-@metamask/snaps-rpc-methods
-9.1.0 <https://github.com/MetaMask/snaps>
-Copyright ConsenSys Software Inc. 2021. All rights reserved.
- 
-You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
- 
-Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
- 
-You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
- 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
- 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
- 
-“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
- 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
- 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
- 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
- 
-You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
- 
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
-
-
-******************************
+@metamask/profile-sync-controller
+0.9.7 <https://github.com/MetaMask/core>
+MIT License
 
-@metamask/snaps-sdk
-4.3.0 <https://github.com/MetaMask/snaps>
-ISC License
+Copyright (c) 2024 MetaMask
 
-Copyright (c) 2023 MetaMask
+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:
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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
 
 
 ******************************
 
-@metamask/snaps-utils
-7.4.0 <https://github.com/MetaMask/snaps>
-ISC License
-
-Copyright (c) 2022 MetaMask
+@metamask/providers
+14.0.2 <https://github.com/MetaMask/providers>
+MIT License
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Copyright (c) 2020 MetaMask
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+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.
 
-@metamask/swappable-obj-proxy
-2.2.0 <https://github.com/MetaMask/swappable-obj-proxy>
-license: ISC
-authors: undefined
 
 ******************************
 
-@metamask/transaction-controller
-32.0.0 <https://github.com/MetaMask/core>
+@metamask/providers
+18.1.1 <https://github.com/MetaMask/providers>
 MIT License
 
-Copyright (c) 2018 MetaMask
+Copyright (c) 2020 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20860,12 +20175,13 @@ 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.
 
 
 ******************************
 
-@metamask/user-operation-controller
-10.0.0 <https://github.com/MetaMask/core>
+@metamask/queued-request-controller
+7.0.1 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2023 MetaMask
@@ -20890,165 +20206,64 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 ******************************
 
-@metamask/utils
-5.0.2 <https://github.com/MetaMask/utils>
-ISC License
+@metamask/rate-limit-controller
+6.0.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) 2022 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-@metamask/utils
-8.4.0 <https://github.com/MetaMask/utils>
-ISC License
-
-Copyright (c) 2022 MetaMask
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-micro-ftch
-0.3.1 <>
-The MIT License (MIT)
-
-Copyright (c) 2020 Paul Miller (https://paulmillr.com)
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
+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 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
+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.
-
-******************************
-
-micromark
-2.11.4 <https://github.com/micromark/micromark>
-(The MIT License)
-
-Copyright (c) 2020 Titus Wormer <tituswormer@gmail.com>
-
-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.
-
-
-******************************
-
-mime-db
-1.52.0 <https://github.com/jshttp/mime-db>
-(The MIT License)
-
-Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
-Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
-
-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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 
 ******************************
 
-mime-types
-2.1.35 <https://github.com/jshttp/mime-types>
-(The MIT License)
+@metamask/rpc-errors
+6.4.0 <https://github.com/MetaMask/rpc-errors>
+MIT License
 
-Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
-Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+Copyright (c) 2019 MetaMask
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-mini-create-react-context
-0.3.2 <https://github.com/StringEpsilon/mini-create-react-context>
-Copyright (c) 2019-present StringEpsilon <StringEpsilon@gmail.com>
+@metamask/rpc-errors
+7.0.1 <https://github.com/MetaMask/rpc-errors>
+MIT License
 
-Copyright (c) 2017-2019 James Kyle <me@thejameskyle.com>
+Copyright (c) 2019 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21071,36 +20286,11 @@ SOFTWARE.
 
 ******************************
 
-minimalistic-assert
-1.0.1 <https://github.com/calvinmetcalf/minimalistic-assert>
-Copyright 2015 Calvin Metcalf
-
-Permission to use, copy, modify, and/or distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright notice
-and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************
-
-minimalistic-crypto-utils
-1.0.1 <https://github.com/indutny/minimalistic-crypto-utils>
-license: MIT
-authors: Fedor Indutny <fedor@indutny.com>
-
-******************************
-
-minimatch
-3.1.2 <https://github.com/isaacs/minimatch>
-The ISC License
+@metamask/safe-event-emitter
+3.1.1 <https://github.com/MetaMask/safe-event-emitter>
+ISC License
 
-Copyright (c) Isaac Z. Schlueter and Contributors
+Copyright (c) 2020 MetaMask
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -21111,59 +20301,44 @@ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 ******************************
 
-minimatch
-9.0.4 <https://github.com/isaacs/minimatch>
-The ISC License
-
-Copyright (c) 2011-2023 Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
+@metamask/scure-bip39
+2.1.1 <https://github.com/MetaMask/scure-bip39>
+The MIT License (MIT)
 
-minipass
-7.1.2 <https://github.com/isaacs/minipass>
-The ISC License
+Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
 
-Copyright (c) 2017-2023 npm, Inc., Isaac Z. Schlueter, and Contributors
+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:
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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.
 
 
 ******************************
 
-mkdirp
-1.0.4 <https://github.com/isaacs/node-mkdirp>
-Copyright James Halliday (mail@substack.net) and Isaac Z. Schlueter (i@izs.me)
+@metamask/selected-network-controller
+18.0.2 <https://github.com/MetaMask/core>
+MIT License
 
-This project is free software released under the MIT license:
+Copyright (c) 2023 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21172,51 +20347,24 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 
 ******************************
 
-@mobily/ts-belt
-3.13.1 <https://github.com/mobily/ts-belt>
-The MIT License (MIT)
+@metamask/signature-controller
+21.1.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) Marcin Dziewulski
-
-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.
-
-
-******************************
-
-mock-socket
-9.2.1 <https://github.com/thoov/mock-socket>
-The MIT License (MIT)
-
-Copyright (c) 2017 Travis Hoover
+Copyright (c) 2023 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21234,351 +20382,426 @@ 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.
 
 
 ******************************
 
-ms
-2.1.2 <https://github.com/zeit/ms>
-The MIT License (MIT)
+@metamask/slip44
+3.1.0 <https://github.com/MetaMask/slip44>
+license: ISC
+authors: Dan Finlay <dan@danfinlay.com>
 
-Copyright (c) 2016 Zeit, Inc.
+******************************
 
-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:
+@metamask/slip44
+4.0.0 <https://github.com/MetaMask/slip44>
+license: ISC
+authors: Dan Finlay <dan@danfinlay.com>
 
-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.
+@metamask/smart-transactions-controller
+13.0.0 <https://github.com/MetaMask/smart-transactions-controller>
+Copyright ConsenSys Software Inc. 2020. All rights reserved.
+ 
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
+ 
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
+ 
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
+ 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+ 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
+ 
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
+ 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+ 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+ 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
+ 
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
+ 
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
 
 
 ******************************
 
-ms
-2.1.3 <https://github.com/vercel/ms>
-The MIT License (MIT)
+@metamask/snaps-controllers
+9.12.0 <https://github.com/MetaMask/snaps>
+Copyright ConsenSys Software Inc. 2021. All rights reserved.
+ 
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
+ 
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
+ 
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
+ 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+ 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
+ 
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
+ 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+ 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+ 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
+ 
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
+ 
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
 
-Copyright (c) 2020 Vercel, Inc.
 
-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.
+@metamask/snaps-execution-environments
+6.9.2 <https://github.com/MetaMask/snaps>
+Copyright ConsenSys Software Inc. 2022. All rights reserved.
 
-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.
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
 
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
 
-******************************
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
 
-multibase
-2.0.0 <https://github.com/multiformats/js-multibase>
-MIT License
+1.  give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+2.  subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
 
-Copyright (c) 2020 Protocol Labs Inc.
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion:
 
-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:
+1.  personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+2.  use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+3.  the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
 
-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.
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
 
 
 ******************************
 
-multibase
-4.0.4 <https://github.com/multiformats/js-multibase>
-MIT License
-
-Copyright (c) 2020 Protocol Labs Inc.
-
-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.
+@metamask/snaps-registry
+3.2.2 <https://github.com/MetaMask/snaps-registry>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-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.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
+   1. Definitions.
 
-******************************
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-multicodec
-3.2.1 <https://github.com/multiformats/js-multicodec>
-MIT License
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-Copyright © 2016 Multiformats
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-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:
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-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.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-******************************
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-multiformats
-9.9.0 <https://github.com/multiformats/js-multiformats>
-Copyright 2020 Protocol Labs
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-******************************
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-@multiformats/base-x
-4.0.1 <https://github.com/gozala/@multiformats/base-x>
-The MIT License (MIT)
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-Copyright (c) 2018 base-x contributors
-Copyright (c) 2014-2018 The Bitcoin Core developers
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-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:
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-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.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-******************************
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-multihashes
-2.0.0 <https://github.com/multiformats/js-multihash>
-The MIT License (MIT)
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-Copyright (c) 2020 Protocol Labs Inc.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-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:
+   END OF TERMS AND CONDITIONS
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+   APPENDIX: How to apply the Apache License to your work.
 
-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.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
+   Copyright 2023 Consensys Software Inc.
 
-******************************
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-multihashes
-4.0.2 <https://github.com/multiformats/js-multihash>
-The MIT License (MIT)
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Copyright (c) 2020 Protocol Labs Inc.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-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.
+@metamask/snaps-rpc-methods
+11.5.1 <https://github.com/MetaMask/snaps>
+Copyright ConsenSys Software Inc. 2021. All rights reserved.
+ 
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
+ 
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
+ 
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
+ 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+ 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
+ 
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
+ 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+ 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+ 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
+ 
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
+ 
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
 
 
 ******************************
 
-mz
-2.7.0 <https://github.com/normalize/mz>
-
-The MIT License (MIT)
-
-Copyright (c) 2014-2016 Jonathan Ong me@jongleberry.com and Contributors
+@metamask/snaps-sdk
+6.10.0 <https://github.com/MetaMask/snaps>
+ISC License
 
-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:
+Copyright (c) 2023 MetaMask
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 ******************************
 
-nan
-2.15.0 <https://github.com/nodejs/nan>
-The MIT License (MIT)
-=====================
+@metamask/snaps-utils
+7.8.1 <https://github.com/MetaMask/snaps>
+ISC License
 
-Copyright (c) 2018 NAN contributors
------------------------------------
+Copyright (c) 2022 MetaMask
 
-*NAN contributors listed at <https://github.com/nodejs/nan#contributors>*
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-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.
+******************************
 
+@metamask/snaps-utils
+8.5.2 <https://github.com/MetaMask/snaps>
+ISC License
 
-******************************
+Copyright (c) 2022 MetaMask
 
-nanoid
-2.1.11 <https://github.com/ai/nanoid>
-The MIT License (MIT)
-
-Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-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.
+******************************
 
+@metamask/solana-wallet-snap
+0.1.9 <https://github.com/MetaMask/snap-solana-wallet>
+license: (MIT-0 OR Apache-2.0)
+authors: undefined
 
 ******************************
 
-nanoid
-3.3.7 <https://github.com/ai/nanoid>
-The MIT License (MIT)
+@metamask/superstruct
+3.1.0 <https://github.com/MetaMask/superstruct>
+The MIT License
 
-Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
+Copyright &copy; 2017, [Ian Storm Taylor](https://ianstormtaylor.com)
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-@ngraveio/bc-ur
-1.1.12 <https://github.com/ngraveio/bc-ur>
+@metamask/swappable-obj-proxy
+2.2.0 <https://github.com/MetaMask/swappable-obj-proxy>
+license: ISC
+authors: undefined
+
+******************************
+
+@metamask/transaction-controller
+34.0.0 <https://github.com/MetaMask/core>
 MIT License
 
-Copyright (c) 2021 NGRAVE
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21596,147 +20819,130 @@ 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.
 
 
 ******************************
 
-@noble/ciphers
-0.5.2 <https://github.com/paulmillr/noble-ciphers>
-The MIT License (MIT)
+@metamask/transaction-controller
+38.3.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
-Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
+Copyright (c) 2018 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
+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 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
+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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
 
 ******************************
 
-@noble/curves
-1.3.0 <https://github.com/paulmillr/noble-curves>
-The MIT License (MIT)
+@metamask/user-operation-controller
+13.0.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2023 MetaMask
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
+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 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
+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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
 
 ******************************
 
-@noble/curves
-1.4.0 <https://github.com/paulmillr/noble-curves>
-The MIT License (MIT)
+@metamask/utils
+10.0.1 <https://github.com/MetaMask/utils>
+ISC License
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2022 MetaMask
 
-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:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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.
 
 ******************************
 
-@noble/hashes
-1.1.2 <https://github.com/paulmillr/noble-hashes>
-The MIT License (MIT)
+@metamask/utils
+8.5.0 <https://github.com/MetaMask/utils>
+ISC License
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2022 MetaMask
 
-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:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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.
 
 ******************************
 
-@noble/hashes
-1.1.3 <https://github.com/paulmillr/noble-hashes>
-The MIT License (MIT)
+@metamask/utils
+9.3.0 <https://github.com/MetaMask/utils>
+ISC License
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2022 MetaMask
 
-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:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 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.
 
 ******************************
 
-@noble/hashes
-1.3.3 <https://github.com/paulmillr/noble-hashes>
+micro-ftch
+0.3.1 <>
 The MIT License (MIT)
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2020 Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal
@@ -21758,140 +20964,143 @@ THE SOFTWARE.
 
 ******************************
 
-@noble/hashes
-1.4.0 <https://github.com/paulmillr/noble-hashes>
-The MIT License (MIT)
+micromark
+2.11.4 <https://github.com/micromark/micromark>
+(The MIT License)
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2020 Titus Wormer <tituswormer@gmail.com>
 
-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:
+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 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.
 
-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.
 
 ******************************
 
-@noble/secp256k1
-1.6.3 <https://github.com/paulmillr/noble-secp256k1>
-The MIT License (MIT)
+mime-db
+1.52.0 <https://github.com/jshttp/mime-db>
+(The MIT License)
 
-Copyright (c) 2019 Paul Miller (https://paulmillr.com)
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-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.
-
-******************************
-
-@noble/secp256k1
-1.7.1 <https://github.com/paulmillr/noble-secp256k1>
-The MIT License (MIT)
-
-Copyright (c) 2019 Paul Miller (https://paulmillr.com)
+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:
 
-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 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.
 
-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.
 
 ******************************
 
-node-addon-api
-2.0.2 <https://github.com/nodejs/node-addon-api>
-The MIT License (MIT)
-=====================
+mime-types
+2.1.35 <https://github.com/jshttp/mime-types>
+(The MIT License)
 
-Copyright (c) 2017 Node.js API collaborators
------------------------------------
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
+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:
 
-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 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.
 
-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.
 
 ******************************
 
-node-addon-api
-3.2.1 <https://github.com/nodejs/node-addon-api>
-The MIT License (MIT)
-=====================
-
-Copyright (c) 2017 Node.js API collaborators
------------------------------------
+minimalistic-assert
+1.0.1 <https://github.com/calvinmetcalf/minimalistic-assert>
+Copyright 2015 Calvin Metcalf
 
-*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
 
-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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 
-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.
+minimalistic-crypto-utils
+1.0.1 <https://github.com/indutny/minimalistic-crypto-utils>
+license: MIT
+authors: Fedor Indutny <fedor@indutny.com>
 
 ******************************
 
-node-addon-api
-7.1.0 <https://github.com/nodejs/node-addon-api>
-The MIT License (MIT)
-
-Copyright (c) 2017 [Node.js API collaborators](https://github.com/nodejs/node-addon-api#collaborators)
+minimatch
+3.1.2 <https://github.com/isaacs/minimatch>
+The ISC License
 
-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:
+Copyright (c) Isaac Z. Schlueter and Contributors
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 ******************************
 
-node-fetch
-2.7.0 <https://github.com/bitinn/node-fetch>
-The MIT License (MIT)
+mkdirp
+1.0.4 <https://github.com/isaacs/node-mkdirp>
+Copyright James Halliday (mail@substack.net) and Isaac Z. Schlueter (i@izs.me)
 
-Copyright (c) 2016 David Frank
+This project is free software released under the MIT license:
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21900,26 +21109,51 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+@mobily/ts-belt
+3.13.1 <https://github.com/mobily/ts-belt>
+The MIT License (MIT)
+
+Copyright (c) Marcin Dziewulski
+
+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.
 
 
 ******************************
 
-node-gyp-build
-4.8.0 <https://github.com/prebuild/node-gyp-build>
+mock-socket
+9.2.1 <https://github.com/thoov/mock-socket>
 The MIT License (MIT)
 
-Copyright (c) 2017 Mathias Buus
+Copyright (c) 2017 Travis Hoover
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21928,25 +21162,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-node-releases
-2.0.14 <https://github.com/chicoxyzzy/node-releases>
-The MIT License
+ms
+2.1.2 <https://github.com/zeit/ms>
+The MIT License (MIT)
 
-Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
+Copyright (c) 2016 Zeit, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21955,25 +21189,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-number-to-bn
-1.7.0 <https://github.com/SilentCicero/number-to-bn>
-The MIT License
+ms
+2.1.3 <https://github.com/vercel/ms>
+The MIT License (MIT)
 
-Copyright (c) 2016 Nick Dodson. nickdodson.com
+Copyright (c) 2020 Vercel, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21982,25 +21216,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-object-assign
-4.1.1 <https://github.com/sindresorhus/object-assign>
-The MIT License (MIT)
+multibase
+2.0.0 <https://github.com/multiformats/js-multibase>
+MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) 2020 Protocol Labs Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22009,25 +21243,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-object.assign
-4.1.4 <https://github.com/ljharb/object.assign>
-The MIT License (MIT)
+multibase
+4.0.4 <https://github.com/multiformats/js-multibase>
+MIT License
 
-Copyright (c) 2014 Jordan Harband
+Copyright (c) 2020 Protocol Labs Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22047,13 +21281,14 @@ 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.
 
+
 ******************************
 
-object-inspect
-1.12.3 <https://github.com/inspect-js/object-inspect>
+multicodec
+3.2.1 <https://github.com/multiformats/js-multicodec>
 MIT License
 
-Copyright (c) 2013 James Halliday
+Copyright © 2016 Multiformats
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22076,37 +21311,41 @@ SOFTWARE.
 
 ******************************
 
-object-is
-1.1.5 <https://github.com/es-shims/object-is>
-The MIT License (MIT)
+multiformats
+13.2.2 <https://github.com/multiformats/js-multiformats>
+This project is dual licensed under MIT and Apache-2.0.
 
-Copyright (c) 2014 Jordan Harband
+MIT: https://www.opensource.org/licenses/mit
+Apache-2.0: https://www.apache.org/licenses/license-2.0
 
-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.
+multiformats
+9.9.0 <https://github.com/multiformats/js-multiformats>
+Copyright 2020 Protocol Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 
 ******************************
 
-object-keys
-1.1.1 <https://github.com/ljharb/object-keys>
+@multiformats/base-x
+4.0.1 <https://github.com/gozala/@multiformats/base-x>
 The MIT License (MIT)
 
-Copyright (C) 2013 Jordan Harband
+Copyright (c) 2018 base-x contributors
+Copyright (c) 2014-2018 The Bitcoin Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22115,53 +21354,25 @@ 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 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.
-
-******************************
-
-obj-multiplex
-1.0.0 <>
-license: ISC
-authors: undefined
-
-******************************
-
-once
-1.4.0 <https://github.com/isaacs/once>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-otpauth
-8.0.3 <https://github.com/hectorm/otpauth>
+multihashes
+2.0.0 <https://github.com/multiformats/js-multihash>
 The MIT License (MIT)
-=====================
 
-Copyright © 2022 Héctor Molinero Fernández
+Copyright (c) 2020 Protocol Labs Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22170,25 +21381,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 
 ******************************
 
-pako
-1.0.6 <https://github.com/nodeca/pako>
-(The MIT License)
+multihashes
+4.0.2 <https://github.com/multiformats/js-multihash>
+The MIT License (MIT)
 
-Copyright (C) 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn
+Copyright (c) 2020 Protocol Labs Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22211,69 +21422,82 @@ THE SOFTWARE.
 
 ******************************
 
-parse-entities
-2.0.0 <https://github.com/wooorm/parse-entities>
-(The MIT License)
+nan
+2.15.0 <https://github.com/nodejs/nan>
+The MIT License (MIT)
+=====================
 
-Copyright (c) 2015 Titus Wormer <mailto:tituswormer@gmail.com>
+Copyright (c) 2018 NAN contributors
+-----------------------------------
 
-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:
+*NAN contributors listed at <https://github.com/nodejs/nan#contributors>*
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+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 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.
+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.
 
 
 ******************************
 
-path-exists
-4.0.0 <https://github.com/sindresorhus/path-exists>
-MIT License
+nanoid
+2.1.11 <https://github.com/ai/nanoid>
+The MIT License (MIT)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-path-key
-3.1.1 <https://github.com/sindresorhus/path-key>
-MIT License
+nanoid
+3.3.7 <https://github.com/ai/nanoid>
+The MIT License (MIT)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-path-parse
-1.0.7 <https://github.com/jbgutierrez/path-parse>
-The MIT License (MIT)
+@ngraveio/bc-ur
+1.1.12 <https://github.com/ngraveio/bc-ur>
+MIT License
 
-Copyright (c) 2015 Javier Blanco
+Copyright (c) 2021 NGRAVE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22296,75 +21520,93 @@ SOFTWARE.
 
 ******************************
 
-path-scurry
-1.11.1 <https://github.com/isaacs/path-scurry>
-# Blue Oak Model License
-
-Version 1.0.0
-
-## Purpose
+@noble/ciphers
+0.5.3 <https://github.com/paulmillr/noble-ciphers>
+The MIT License (MIT)
 
-This license gives everyone as much permission to work with
-this software as possible, while protecting contributors
-from liability.
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
 
-## Acceptance
+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:
 
-In order to receive this license, you must agree to its
-rules.  The rules of this license are both obligations
-under that agreement and conditions to your license.
-You must not do anything with this software that triggers
-a rule that you cannot or will not follow.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-## Copyright
+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.
 
-Each contributor licenses you to do everything with this
-software that would otherwise infringe that contributor's
-copyright in it.
+******************************
 
-## Notices
+@noble/curves
+1.2.0 <https://github.com/paulmillr/noble-curves>
+The MIT License (MIT)
 
-You must ensure that everyone who gets a copy of
-any part of this software from you, with or without
-changes, also gets the text of this license or a link to
-<https://blueoakcouncil.org/license/1.0.0>.
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
 
-## Excuse
+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:
 
-If anyone notifies you in writing that you have not
-complied with [Notices](#notices), you can keep your
-license by taking all practical steps to comply within 30
-days after the notice.  If you do not do so, your license
-ends immediately.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-## Patent
+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.
 
-Each contributor licenses you to do everything with this
-software that would otherwise infringe any patent claims
-they can license or become able to license.
+******************************
 
-## Reliability
+@noble/curves
+1.4.2 <https://github.com/paulmillr/noble-curves>
+The MIT License (MIT)
 
-No contributor can revoke this license.
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
 
-## No Liability
+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:
 
-***As far as the law allows, this software comes as is,
-without any warranty or condition, and no contributor
-will be liable to anyone for any damages related to this
-software or this license, under any kind of legal claim.***
+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.
 
 ******************************
 
-path-to-regexp
-1.7.0 <https://github.com/pillarjs/path-to-regexp>
+@noble/hashes
+1.3.2 <https://github.com/paulmillr/noble-hashes>
 The MIT License (MIT)
 
-Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+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
@@ -22373,7 +21615,7 @@ 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
+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
@@ -22381,39 +21623,121 @@ 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.
 
-
 ******************************
 
-pbkdf2
-3.1.2 <https://github.com/crypto-browserify/pbkdf2>
+@noble/hashes
+1.3.3 <https://github.com/paulmillr/noble-hashes>
 The MIT License (MIT)
 
-Copyright (c) 2014 Daniel Cousens
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+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 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
+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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+@noble/hashes
+1.4.0 <https://github.com/paulmillr/noble-hashes>
+The MIT License (MIT)
+
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+
+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.
 
 ******************************
 
-performance-now
-0.2.0 <https://github.com/meryn/performance-now>
-Copyright (c) 2013 Meryn Stol
+@noble/hashes
+1.5.0 <https://github.com/paulmillr/noble-hashes>
+The MIT License (MIT)
+
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+
+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.
+
+******************************
+
+@noble/secp256k1
+1.7.1 <https://github.com/paulmillr/noble-secp256k1>
+The MIT License (MIT)
+
+Copyright (c) 2019 Paul Miller (https://paulmillr.com)
+
+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.
+
+******************************
+
+node-addon-api
+2.0.2 <https://github.com/nodejs/node-addon-api>
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2017 Node.js API collaborators
+-----------------------------------
+
+*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
 
 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:
 
@@ -22423,9 +21747,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ******************************
 
-performance-now
-2.1.0 <https://github.com/braveg1rl/performance-now>
-Copyright (c) 2013 Braveg1rl
+node-addon-api
+3.2.1 <https://github.com/nodejs/node-addon-api>
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2017 Node.js API collaborators
+-----------------------------------
+
+*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
 
 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:
 
@@ -22435,32 +21765,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ******************************
 
-picocolors
-1.0.0 <https://github.com/alexeyraspopov/picocolors>
-ISC License
+node-addon-api
+5.1.0 <https://github.com/nodejs/node-addon-api>
+The MIT License (MIT)
+=====================
 
-Copyright (c) 2021 Alexey Raspopov, Kostiantyn Denysov, Anton Verinov
+Copyright (c) 2017 Node.js API collaborators
+-----------------------------------
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+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.
 
 ******************************
 
-pify
-5.0.0 <https://github.com/sindresorhus/pify>
-MIT License
+node-addon-api
+7.1.0 <https://github.com/nodejs/node-addon-api>
+The MIT License (MIT)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+Copyright (c) 2017 [Node.js API collaborators](https://github.com/nodejs/node-addon-api#collaborators)
 
 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:
 
@@ -22471,11 +21798,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ******************************
 
-pirates
-4.0.6 <https://github.com/danez/pirates>
-MIT License
+node-fetch
+2.7.0 <https://github.com/bitinn/node-fetch>
+The MIT License (MIT)
 
-Copyright (c) 2016-2018 Ari Porad
+Copyright (c) 2016 David Frank
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22496,314 +21823,175 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+
 ******************************
 
-@pkgjs/parseargs
-0.11.0 <https://github.com/pkgjs/parseargs>
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+node-gyp-build
+4.8.0 <https://github.com/prebuild/node-gyp-build>
+The MIT License (MIT)
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2017 Mathias Buus
 
-   1. Definitions.
+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:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+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.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+******************************
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+node-releases
+2.0.18 <https://github.com/chicoxyzzy/node-releases>
+The MIT License
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+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:
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+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.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+******************************
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+number-to-bn
+1.7.0 <https://github.com/SilentCicero/number-to-bn>
+The MIT License
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+Copyright (c) 2016 Nick Dodson. nickdodson.com
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+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:
 
-       http://www.apache.org/licenses/LICENSE-2.0
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+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.
 
 
 ******************************
 
-p-limit
-3.1.0 <https://github.com/sindresorhus/p-limit>
-MIT License
+object-assign
+4.1.1 <https://github.com/sindresorhus/object-assign>
+The MIT License (MIT)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-plist
-3.1.0 <https://github.com/TooTallNate/node-plist>
-(The MIT License)
-
-Copyright (c) 2010-2017 Nathan Rajlich <nathan@tootallnate.net>
+object.assign
+4.1.5 <https://github.com/ljharb/object.assign>
+The MIT License (MIT)
 
-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:
+Copyright (c) 2014 Jordan Harband
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+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 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.
+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.
 
 ******************************
 
-p-locate
-5.0.0 <https://github.com/sindresorhus/p-locate>
+object-inspect
+1.13.2 <https://github.com/inspect-js/object-inspect>
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
-******************************
-
-pony-cause
-2.1.10 <https://github.com/voxpelli/pony-cause>
-BSD Zero Clause License (0BSD)
-
-Copyright (c) 2020 Pelle Wessman
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
+Copyright (c) 2013 James Halliday
 
-******************************
+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:
 
-popper.js
-1.15.0 <https://github.com/FezVrasta/popper.js>
-license: MIT
-authors: Federico Zivolo <federico.zivolo@gmail.com>
+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.
 
-popper.js
-1.16.1-lts <https://github.com/FezVrasta/popper.js>
-license: MIT
-authors: Federico Zivolo <federico.zivolo@gmail.com>
 
 ******************************
 
-@popperjs/core
-2.9.2 <https://github.com/popperjs/popper-core>
+object-is
+1.1.5 <https://github.com/es-shims/object-is>
 The MIT License (MIT)
 
-Copyright (c) 2019 Federico Zivolo
+Copyright (c) 2014 Jordan Harband
 
 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
@@ -22825,31 +22013,85 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-printj
-1.1.2 <https://github.com/SheetJS/printj>
-Copyright (C) 2016-present  SheetJS
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+object-keys
+1.1.1 <https://github.com/ljharb/object-keys>
+The MIT License (MIT)
 
-       http://www.apache.org/licenses/LICENSE-2.0
+Copyright (C) 2013 Jordan Harband
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+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.
 
 ******************************
 
-process
-0.11.10 <https://github.com/shtylman/node-process>
+once
+1.4.0 <https://github.com/isaacs/once>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+pako
+1.0.6 <https://github.com/nodeca/pako>
 (The MIT License)
 
-Copyright (c) 2013 Roman Shtylman <shtylman@gmail.com>
+Copyright (C) 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn
+
+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.
+
+
+******************************
+
+parse-entities
+2.0.0 <https://github.com/wooorm/parse-entities>
+(The MIT License)
+
+Copyright (c) 2015 Titus Wormer <mailto:tituswormer@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -22873,9 +22115,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-process-nextick-args
-2.0.1 <https://github.com/calvinmetcalf/process-nextick-args>
-# Copyright (c) 2015 Calvin Metcalf
+path-parse
+1.0.7 <https://github.com/jbgutierrez/path-parse>
+The MIT License (MIT)
+
+Copyright (c) 2015 Javier Blanco
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22887,21 +22131,22 @@ 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
+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.**
+SOFTWARE.
 
 
 ******************************
 
-promise-polyfill
-8.3.0 <https://github.com/taylorhakes/promise-polyfill>
-Copyright (c) 2014 Taylor Hakes
-Copyright (c) 2014 Forbes Lindesay
+path-to-regexp
+1.9.0 <https://github.com/pillarjs/path-to-regexp>
+The MIT License (MIT)
+
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22921,13 +22166,14 @@ 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.
 
+
 ******************************
 
-promise-to-callback
-1.0.0 <https://github.com/stevemao/promise-to-callback>
+pbkdf2
+3.1.2 <https://github.com/crypto-browserify/pbkdf2>
 The MIT License (MIT)
 
-Copyright (c) Steve Mao <maochenyan@gmail.com> (github.com/stevemao)
+Copyright (c) 2014 Daniel Cousens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22936,53 +22182,145 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-property-information
-5.6.0 <https://github.com/wooorm/property-information>
-(The MIT License)
+performance-now
+0.2.0 <https://github.com/meryn/performance-now>
+Copyright (c) 2013 Meryn Stol
 
-Copyright (c) 2015 Titus Wormer <mailto:tituswormer@gmail.com>
+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:
 
-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 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.
 
-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.
+******************************
+
+performance-now
+2.1.0 <https://github.com/braveg1rl/performance-now>
+Copyright (c) 2013 Braveg1rl
+
+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.
 
 ******************************
 
-prop-types
-15.8.1 <https://github.com/facebook/prop-types>
+picocolors
+1.1.1 <https://github.com/alexeyraspopov/picocolors>
+ISC License
+
+Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+pify
+5.0.0 <https://github.com/sindresorhus/pify>
 MIT License
 
-Copyright (c) 2013-present, Facebook, Inc.
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+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.
+
+
+******************************
+
+pony-cause
+2.1.10 <https://github.com/voxpelli/pony-cause>
+BSD Zero Clause License (0BSD)
+
+Copyright (c) 2020 Pelle Wessman
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+popper.js
+1.15.0 <https://github.com/FezVrasta/popper.js>
+license: MIT
+authors: Federico Zivolo <federico.zivolo@gmail.com>
+
+******************************
+
+popper.js
+1.16.1-lts <https://github.com/FezVrasta/popper.js>
+license: MIT
+authors: Federico Zivolo <federico.zivolo@gmail.com>
+
+******************************
+
+@popperjs/core
+2.9.2 <https://github.com/popperjs/popper-core>
+The MIT License (MIT)
+
+Copyright (c) 2019 Federico Zivolo
+
+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.
+
+
+******************************
+
+possible-typed-array-names
+1.0.0 <https://github.com/ljharb/possible-typed-array-names>
+MIT License
+
+Copyright (c) 2024 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23005,17 +22343,177 @@ SOFTWARE.
 
 ******************************
 
-protobufjs
-7.2.6 <https://github.com/protobufjs/protobuf.js>
-This license applies to all parts of protobuf.js except those files
-either explicitly including or referencing a different license or
-located in a directory containing a different LICENSE file.
-
----
+process
+0.11.10 <https://github.com/shtylman/node-process>
+(The MIT License)
 
-Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+Copyright (c) 2013 Roman Shtylman <shtylman@gmail.com>
 
-Redistribution and use in source and binary forms, with or without
+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.
+
+
+******************************
+
+process-nextick-args
+2.0.1 <https://github.com/calvinmetcalf/process-nextick-args>
+# Copyright (c) 2015 Calvin Metcalf
+
+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.**
+
+
+******************************
+
+promise-polyfill
+8.3.0 <https://github.com/taylorhakes/promise-polyfill>
+Copyright (c) 2014 Taylor Hakes
+Copyright (c) 2014 Forbes Lindesay
+
+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.
+
+******************************
+
+promise-to-callback
+1.0.0 <https://github.com/stevemao/promise-to-callback>
+The MIT License (MIT)
+
+Copyright (c) Steve Mao <maochenyan@gmail.com> (github.com/stevemao)
+
+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.
+
+
+******************************
+
+property-information
+5.6.0 <https://github.com/wooorm/property-information>
+(The MIT License)
+
+Copyright (c) 2015 Titus Wormer <mailto:tituswormer@gmail.com>
+
+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.
+
+
+******************************
+
+prop-types
+15.8.1 <https://github.com/facebook/prop-types>
+MIT License
+
+Copyright (c) 2013-present, Facebook, Inc.
+
+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.
+
+
+******************************
+
+protobufjs
+7.2.6 <https://github.com/protobufjs/protobuf.js>
+This license applies to all parts of protobuf.js except those files
+either explicitly including or referencing a different license or
+located in a directory containing a different LICENSE file.
+
+---
+
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
@@ -23394,21 +22892,6 @@ 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.
 
 
-******************************
-
-p-throttle
-4.1.1 <https://github.com/sindresorhus/p-throttle>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 punycode
@@ -23498,7 +22981,7 @@ authors: Kazuhiko Arase
 ******************************
 
 qrcode.react
-1.0.1 <https://github.com/zpao/qrcode.react>
+3.1.0 <https://github.com/zpao/qrcode.react>
 ISC License
 
 Copyright (c) 2015, Paul O’Shannessy
@@ -23515,53 +22998,8 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-******************************
-
-qr.js
-0.0.0 <https://github.com/shtylman/qr.js>
-Copyright (c) 2013 Roman Shtylman
-
-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.
-
-
-******************************
-
-qs
-6.11.2 <https://github.com/ljharb/qs>
-BSD 3-Clause License
-
-Copyright (c) 2014, Nathan LaFreniere and other [contributors](https://github.com/ljharb/qs/graphs/contributors)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This product bundles QR Code Generator, which is available under a
+"MIT" license. For details, see src/third-party/qrcodegen.
 
 
 ******************************
@@ -23679,6 +23117,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+react
+18.2.0 <https://github.com/facebook/react>
+MIT License
+
+Copyright (c) Facebook, Inc. and its affiliates.
+
+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.
+
+
 ******************************
 
 react-beautiful-dnd
@@ -23698,6 +23163,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 
+******************************
+
+react-chartjs-2
+5.2.0 <https://github.com/reactchartjs/react-chartjs-2>
+Copyright 2020 Jeremy Ayerst
+
+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.
+
+
 ******************************
 
 react-clientside-effect
@@ -23755,11 +23233,38 @@ SOFTWARE.
 
 ******************************
 
-react-easy-swipe
-0.0.21 <https://github.com/leandrowd/react-easy-swipe>
-license: MIT
-authors: Leandro Augusto Lemos <http://leandrowd.github.io/>
-
+react-dom
+18.2.0 <https://github.com/facebook/react>
+MIT License
+
+Copyright (c) Facebook, Inc. and its affiliates.
+
+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.
+
+
+******************************
+
+react-easy-swipe
+0.0.21 <https://github.com/leandrowd/react-easy-swipe>
+license: MIT
+authors: Leandro Augusto Lemos <http://leandrowd.github.io/>
+
 ******************************
 
 react-fast-compare
@@ -23978,13 +23483,6 @@ SOFTWARE.
 
 
 
-******************************
-
-@react-native/normalize-color
-2.1.0 <https://github.com/facebook/react-native>
-license: MIT
-authors: undefined
-
 ******************************
 
 react-popper
@@ -24015,7 +23513,7 @@ SOFTWARE.
 ******************************
 
 react-redux
-7.2.0 <https://github.com/reduxjs/react-redux>
+7.2.9 <https://github.com/reduxjs/react-redux>
 The MIT License (MIT)
 
 Copyright (c) 2015-present Dan Abramov
@@ -24069,10 +23567,40 @@ SOFTWARE.
 ******************************
 
 react-router
-5.1.2 <https://github.com/ReactTraining/react-router>
+5.3.4 <https://github.com/remix-run/react-router>
 MIT License
 
-Copyright (c) React Training 2016-2018
+Copyright (c) React Training 2015-2019
+Copyright (c) Remix Software 2020-2022
+
+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.
+
+
+******************************
+
+react-router
+6.26.2 <https://github.com/remix-run/react-router>
+MIT License
+
+Copyright (c) React Training LLC 2015-2019
+Copyright (c) Remix Software Inc. 2020-2021
+Copyright (c) Shopify Inc. 2022-2023
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24096,10 +23624,40 @@ SOFTWARE.
 ******************************
 
 react-router-dom
-5.1.2 <https://github.com/ReactTraining/react-router>
+5.3.4 <https://github.com/remix-run/react-router>
 MIT License
 
-Copyright (c) React Training 2016-2018
+Copyright (c) React Training 2015-2019
+Copyright (c) Remix Software 2020-2022
+
+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.
+
+
+******************************
+
+react-router-dom-v5-compat
+6.26.2 <https://github.com/remix-run/react-router>
+MIT License
+
+Copyright (c) React Training LLC 2015-2019
+Copyright (c) Remix Software Inc. 2020-2021
+Copyright (c) Shopify Inc. 2022-2023
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24481,7 +24039,7 @@ SOFTWARE.
 ******************************
 
 regexp.prototype.flags
-1.5.1 <https://github.com/es-shims/RegExp.prototype.flags>
+1.5.2 <https://github.com/es-shims/RegExp.prototype.flags>
 The MIT License (MIT)
 
 Copyright (C) 2014 Jordan Harband
@@ -24541,6 +24099,35 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+******************************
+
+@remix-run/router
+1.19.2 <https://github.com/remix-run/react-router>
+MIT License
+
+Copyright (c) React Training LLC 2015-2019
+Copyright (c) Remix Software Inc. 2020-2021
+Copyright (c) Shopify Inc. 2022-2023
+
+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.
+
+
 ******************************
 
 remove-trailing-slash
@@ -24605,11 +24192,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-require-from-string
-2.0.2 <https://github.com/floatdrop/require-from-string>
+reselect
+3.0.1 <https://github.com/reactjs/reselect>
 The MIT License (MIT)
 
-Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)
+Copyright (c) 2015-2016 Reselect Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24618,25 +24205,25 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
 reselect
-3.0.1 <https://github.com/reactjs/reselect>
+4.1.8 <https://github.com/reduxjs/reselect>
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Reselect Contributors
+Copyright (c) 2015-2018 Reselect Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24660,7 +24247,7 @@ SOFTWARE.
 ******************************
 
 reselect
-4.1.8 <https://github.com/reduxjs/reselect>
+5.1.1 <https://github.com/reduxjs/reselect>
 The MIT License (MIT)
 
 Copyright (c) 2015-2018 Reselect Contributors
@@ -24711,21 +24298,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-resolve-from
-5.0.0 <https://github.com/sindresorhus/resolve-from>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-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.
-
-
 ******************************
 
 resolve-pathname
@@ -25864,7 +25436,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 rpc-websockets
-7.11.1 <https://github.com/elpheria/rpc-websockets>
+8.0.1 <https://github.com/elpheria/rpc-websockets>
 Copyright (c) Elpheria j.d.o.o.
 
 rpc-websockets is an Open Source project licensed under the terms of
@@ -25877,6 +25449,214 @@ Please see https://www.elpheria.com/products/rpc-websockets-pro.html
 or email us at info@elpheria.com for more detail.
 
 
+******************************
+
+rxjs
+7.8.1 <https://github.com/reactivex/rxjs>
+                               Apache License
+                         Version 2.0, January 2004
+                      http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+        Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+        stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+        that You distribute, all copyright, patent, trademark, and
+        attribution notices from the Source form of the Work,
+        excluding those notices that do not pertain to any part of
+        the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+        distribution, then any Derivative Works that You distribute must
+        include a readable copy of the attribution notices contained
+        within such NOTICE file, excluding those notices that do not
+        pertain to any part of the Derivative Works, in at least one
+        of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or
+        documentation, if provided along with the Derivative Works; or,
+        within a display generated by the Derivative Works, if and
+        wherever such third-party notices normally appear. The contents
+        of the NOTICE file are for informational purposes only and
+        do not modify the License. You may add Your own attribution
+        notices within Derivative Works that You distribute, alongside
+        or as an addendum to the NOTICE text from the Work, provided
+        that such additional attribution notices cannot be construed
+        as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+    To apply the Apache License to your work, attach the following
+    boilerplate notice, with the fields enclosed by brackets "[]"
+    replaced with your own identifying information. (Don't include
+    the brackets!)  The text should be enclosed in the appropriate
+    comment syntax for the file format. We also recommend that a
+    file or class name and description of purpose be included on the
+    same "printed page" as the copyright notice for easier
+    identification within third-party archives.
+
+ Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ 
+
+
 ******************************
 
 safe-buffer
@@ -25985,53 +25765,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-sax
-1.3.0 <https://github.com/isaacs/sax-js>
-The ISC License
-
-Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-====
-
-`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
-License, as follows:
-
-Copyright (c) 2010-2022 Mathias Bynens <https://mathiasbynens.be/>
-
-    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.
-
-
 ******************************
 
 scheduler
@@ -26061,11 +25794,11 @@ SOFTWARE.
 
 ******************************
 
-scrypt-js
-3.0.1 <https://github.com/ricmoo/scrypt-js>
-The MIT License (MIT)
+scheduler
+0.23.0 <https://github.com/facebook/react>
+MIT License
 
-Copyright (c) 2016 Richard Moore
+Copyright (c) Facebook, Inc. and its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26074,29 +25807,28 @@ 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 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.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-@scure/base
-1.1.6 <https://github.com/paulmillr/scure-base>
+scrypt-js
+3.0.1 <https://github.com/ricmoo/scrypt-js>
 The MIT License (MIT)
 
-Copyright (c) 2022 Paul Miller (https://paulmillr.com)
+Copyright (c) 2016 Richard Moore
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
+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
@@ -26105,7 +25837,7 @@ 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
+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
@@ -26114,40 +25846,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-******************************
-
-@scure/bip32
-1.1.0 <https://github.com/paulmillr/scure-bip32>
-The MIT License (MIT)
-
-Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
-
-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.
-
 
 ******************************
 
-@scure/bip32
-1.3.3 <https://github.com/paulmillr/scure-bip32>
+@scure/base
+1.1.9 <https://github.com/paulmillr/scure-base>
 The MIT License (MIT)
 
-Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
+Copyright (c) 2022 Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal
@@ -26170,8 +25876,8 @@ THE SOFTWARE.
 
 ******************************
 
-@scure/bip39
-1.1.0 <https://github.com/paulmillr/scure-bip39>
+@scure/bip32
+1.4.0 <https://github.com/paulmillr/scure-bip32>
 The MIT License (MIT)
 
 Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
@@ -26198,7 +25904,7 @@ THE SOFTWARE.
 ******************************
 
 @scure/bip39
-1.2.2 <https://github.com/paulmillr/scure-bip39>
+1.3.0 <https://github.com/paulmillr/scure-bip39>
 The MIT License (MIT)
 
 Copyright (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com)
@@ -26225,7 +25931,7 @@ THE SOFTWARE.
 ******************************
 
 secp256k1
-4.0.2 <https://github.com/cryptocoinjs/secp256k1-node>
+4.0.4 <https://github.com/cryptocoinjs/secp256k1-node>
 The MIT License (MIT)
 
 Copyright (c) 2014-2016 secp256k1-node contributors
@@ -26255,7 +25961,7 @@ THE SOFTWARE.
 ******************************
 
 secp256k1
-4.0.3 <https://github.com/cryptocoinjs/secp256k1-node>
+5.0.1 <https://github.com/cryptocoinjs/secp256k1-node>
 The MIT License (MIT)
 
 Copyright (c) 2014-2016 secp256k1-node contributors
@@ -26333,28 +26039,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 semver
-7.5.3 <https://github.com/npm/node-semver>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-semver
-7.6.2 <https://github.com/npm/node-semver>
+7.6.3 <https://github.com/npm/node-semver>
 The ISC License
 
 Copyright (c) Isaac Z. Schlueter and Contributors
@@ -26375,141 +26060,217 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @sentry/browser
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
 
-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:
+Copyright (c) 2019-2024 Functional Software, Inc. dba Sentry
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
-Software.
+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 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.
+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.
 
 
 ******************************
 
 @sentry/core
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2019-2024 Functional Software, Inc. dba Sentry
+
+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.
+
+
+******************************
+
+@sentry-internal/browser-utils
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2020-2024 Functional Software, Inc. dba Sentry
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-@sentry/integrations
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+@sentry-internal/feedback
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2023-2024 Functional Software, Inc. dba Sentry
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-@sentry-internal/tracing
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2020 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+@sentry-internal/replay
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2022-2024 Functional Software, Inc. dba Sentry
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-@sentry/replay
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2022 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+@sentry-internal/replay-canvas
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2024 Functional Software, Inc. dba Sentry
 
-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:
+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 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.
+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.
 
 
 ******************************
 
 @sentry/types
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
+
+Copyright (c) 2019-2024 Functional Software, Inc. dba Sentry
 
-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:
+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 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.
+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.
 
 
 ******************************
 
 @sentry/utils
-7.53.0 <https://github.com/getsentry/sentry-javascript>
-Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+8.33.1 <https://github.com/getsentry/sentry-javascript>
+MIT License
 
-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:
+Copyright (c) 2019-2024 Functional Software, Inc. dba Sentry
+
+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 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.
+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.
 
 
 ******************************
@@ -26722,7 +26483,7 @@ ses
 ******************************
 
 set-function-length
-1.2.1 <https://github.com/ljharb/set-function-length>
+1.2.2 <https://github.com/ljharb/set-function-length>
 MIT License
 
 Copyright (c) Jordan Harband and contributors
@@ -26749,7 +26510,7 @@ SOFTWARE.
 ******************************
 
 set-function-name
-2.0.1 <https://github.com/ljharb/set-function-name>
+2.0.2 <https://github.com/ljharb/set-function-name>
 MIT License
 
 Copyright (c) Jordan Harband and contributors
@@ -26806,6 +26567,33 @@ set-immediate-shim
 license: MIT
 authors: Sindre Sorhus <sindresorhus@gmail.com>
 
+******************************
+
+sha256-uint8array
+0.10.7 <https://github.com/kawanet/sha256-uint8array>
+MIT License
+
+Copyright (c) 2020-2023 Yusuke Kawasaki
+
+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.
+
+
 ******************************
 
 sha.js
@@ -26861,36 +26649,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
-******************************
-
-shebang-command
-2.0.0 <https://github.com/kevva/shebang-command>
-MIT License
-
-Copyright (c) Kevin Mårtensson <kevinmartensson@gmail.com> (github.com/kevva)
-
-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.
-
-
-******************************
-
-shebang-regex
-3.0.0 <https://github.com/sindresorhus/shebang-regex>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-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.
-
-
 ******************************
 
 side-channel
@@ -26918,50 +26676,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-signal-exit
-3.0.7 <https://github.com/tapjs/signal-exit>
-The ISC License
-
-Copyright (c) 2015, Contributors
-
-Permission to use, copy, modify, and/or distribute this software
-for any purpose with or without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-signal-exit
-4.0.2 <https://github.com/tapjs/signal-exit>
-The ISC License
-
-Copyright (c) 2015-2023 Benjamin Coe, Isaac Z. Schlueter, and Contributors
-
-Permission to use, copy, modify, and/or distribute this software
-for any purpose with or without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 simple-git
@@ -26969,32 +26683,6 @@ simple-git
 license: MIT
 authors: Steve King <steve@mydev.co>
 
-******************************
-
-simple-plist
-1.4.0 <https://github.com/wollardj/simple-plist>
-The MIT License (MIT)
-
-Copyright (c) 2013 Joe Wollard
-
-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.
-
-
 ******************************
 
 @sinclair/typebox
@@ -27032,53 +26720,18 @@ authors: Will O'Beirne
 
 ******************************
 
-slash
-3.0.0 <https://github.com/sindresorhus/slash>
-MIT License
+siwe
+2.3.2 <https://github.com/spruceid/siwe>
+license: Apache-2.0
+authors: Spruce Systems Inc.
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+******************************
 
-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:
+smart-buffer
+4.2.0 <https://github.com/JoshGlazebrook/smart-buffer>
+The MIT License (MIT)
 
-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.
-
-
-******************************
-
-slugify
-1.6.6 <https://github.com/simov/slugify>
-The MIT License (MIT)
-
-Copyright (c) Simeon Velichkov <simeonvelichkov@gmail.com>
-
-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.
-
-
-******************************
-
-smart-buffer
-4.2.0 <https://github.com/JoshGlazebrook/smart-buffer>
-The MIT License (MIT)
-
-Copyright (c) 2013-2017 Josh Glazebrook
+Copyright (c) 2013-2017 Josh Glazebrook
 
 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
@@ -27131,6 +26784,58 @@ socks-proxy-agent
 license: MIT
 authors: Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
 
+******************************
+
+@solana/addresses
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
+******************************
+
+@solana/assertions
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
 ******************************
 
 @solana/buffer-layout
@@ -27158,10 +26863,114 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+******************************
+
+@solana/codecs-core
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
+******************************
+
+@solana/codecs-numbers
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
+******************************
+
+@solana/codecs-strings
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
+******************************
+
+@solana/errors
+2.0.0-rc.4 <https://github.com/solana-labs/solana-web3.js>
+Copyright (c) 2023 Solana Labs, Inc
+
+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.
+
+
 ******************************
 
 @solana/web3.js
-1.91.8 <https://github.com/solana-labs/solana-web3.js>
+1.95.4 <https://github.com/solana-labs/solana-web3.js>
 Copyright (c) 2023 Solana Labs, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -27184,6 +26993,13 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+******************************
+
+@sovpro/delimited-stream
+1.1.0 <https://github.com/sovpro/delimited-stream>
+license: MIT
+authors: sovpro <its.so@outlook.com>
+
 ******************************
 
 space-separated-tokens
@@ -27251,18 +27067,25 @@ authors: Spruce Systems Inc.
 
 ******************************
 
-stop-iteration-iterator
-1.0.0 <https://github.com/ljharb/stop-iteration-iterator>
-MIT License
+@spruceid/siwe-parser
+2.1.2 <https://github.com/spruceid/siwe>
+license: Apache-2.0
+authors: Spruce Systems Inc.
 
-Copyright (c) 2023 Jordan Harband
+******************************
 
-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:
+@stablelib/binary
+1.0.1 <https://github.com/StableLib/stablelib>
+This software is licensed under the MIT license:
+
+Copyright (C) 2016 Dmitry Chestnykh
+
+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.
@@ -27278,73 +27101,174 @@ SOFTWARE.
 
 ******************************
 
-stream-browserify
-3.0.0 <https://github.com/browserify/stream-browserify>
-MIT License
+@stablelib/int
+1.0.1 <https://github.com/StableLib/stablelib>
+This software is licensed under the MIT license:
 
-Copyright (c) James Halliday
+Copyright (C) 2016 Dmitry Chestnykh
 
 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:
+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.
+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.
 
 
 ******************************
 
-stream-buffers
-2.2.0 <https://github.com/samcday/node-stream-buffer>
-license: Unlicense
-authors: Sam Day <me@samcday.com.au>
-
-******************************
+@stablelib/random
+1.0.2 <https://github.com/StableLib/stablelib>
+This software is licensed under the MIT license:
 
-stream-splicer
-2.0.0 <https://github.com/substack/stream-splicer>
-This software is released under the MIT license:
+Copyright (C) 2016 Dmitry Chestnykh
 
 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:
+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.
+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.
 
 
 ******************************
 
-streamx
-2.15.1 <https://github.com/mafintosh/streamx>
-The MIT License (MIT)
+@stablelib/wipe
+1.0.1 <https://github.com/StableLib/stablelib>
+This software is licensed under the MIT license:
 
-Copyright (c) 2019 Mathias Buus
+Copyright (C) 2016 Dmitry Chestnykh
 
-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
+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.
+
+
+******************************
+
+stop-iteration-iterator
+1.0.0 <https://github.com/ljharb/stop-iteration-iterator>
+MIT License
+
+Copyright (c) 2023 Jordan Harband
+
+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.
+
+
+******************************
+
+stream-browserify
+3.0.0 <https://github.com/browserify/stream-browserify>
+MIT License
+
+Copyright (c) James Halliday
+
+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.
+
+
+******************************
+
+stream-splicer
+2.0.0 <https://github.com/substack/stream-splicer>
+This software is released under the MIT license:
+
+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.
+
+
+******************************
+
+streamx
+2.15.1 <https://github.com/mafintosh/streamx>
+The MIT License (MIT)
+
+Copyright (c) 2019 Mathias Buus
+
+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:
 
@@ -27483,21 +27407,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-string-width
-5.1.2 <https://github.com/sindresorhus/string-width>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 strip-ansi
@@ -27513,21 +27422,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-strip-ansi
-7.1.0 <https://github.com/chalk/strip-ansi>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 strip-hex-prefix
@@ -27610,37 +27504,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-sucrase
-3.35.0 <https://github.com/alangpierce/sucrase>
-The MIT License (MIT)
-
-Copyright (c) 2012-2018 various contributors (see AUTHORS)
-
-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.
-
-
 ******************************
 
 superstruct
-0.14.2 <https://github.com/ianstormtaylor/superstruct>
+1.0.3 <https://github.com/ianstormtaylor/superstruct>
 The MIT License
 
 Copyright &copy; 2017, [Ian Storm Taylor](https://ianstormtaylor.com)
@@ -27655,7 +27522,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ******************************
 
 superstruct
-1.0.3 <https://github.com/ianstormtaylor/superstruct>
+2.0.2 <https://github.com/ianstormtaylor/superstruct>
 The MIT License
 
 Copyright &copy; 2017, [Ian Storm Taylor](https://ianstormtaylor.com)
@@ -27724,6 +27591,432 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+@swc/core
+1.4.11 <https://github.com/swc-project/swc>
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+******************************
+
+@swc/core-linux-x64-gnu
+1.4.11 <https://github.com/swc-project/swc>
+license: Apache-2.0 AND MIT
+authors: 강동윤 <kdy1997.dev@gmail.com>
+
+******************************
+
+@swc/counter
+0.1.3 <https://github.com/swc-project/pkgs>
+license: Apache-2.0
+authors: 강동윤 <kdy1997.dev@gmail.com>
+
+******************************
+
+@swc/types
+0.1.12 <https://github.com/swc-project/swc>
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 ******************************
 
 tar-stream
@@ -27787,12 +28080,32 @@ For more information, please refer to <http://unlicense.org/>
 
 ******************************
 
-thenify
-3.3.1 <https://github.com/thenables/thenify>
+through
+2.3.8 <https://github.com/dominictarr/through>
+Apache License, Version 2.0
+
+Copyright (c) 2011 Dominic Tarr
 
-The MIT License (MIT)
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+******************************
+
+tiny-invariant
+1.3.3 <https://github.com/alexreardon/tiny-invariant>
+MIT License
 
-Copyright (c) 2014-2016 Jonathan Ong me@jongleberry.com and contributors
+Copyright (c) 2019 Alexander Reardon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -27801,115 +28114,24 @@ 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 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.
-
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ******************************
 
-thenify-all
-1.6.0 <https://github.com/thenables/thenify-all>
+tiny-secp256k1
+1.1.6 <https://github.com/bitcoinjs/tiny-secp256k1>
+MIT License
 
-The MIT License (MIT)
-
-Copyright (c) 2014 Jonathan Ong me@jongleberry.com
-
-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.
-
-
-******************************
-
-through
-2.3.8 <https://github.com/dominictarr/through>
-Apache License, Version 2.0
-
-Copyright (c) 2011 Dominic Tarr
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-******************************
-
-through2
-2.0.5 <https://github.com/rvagg/through2>
-# The MIT License (MIT)
-
-**Copyright (c) Rod Vagg (the "Original Author") and additional contributors**
-
-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.
-
-
-******************************
-
-tiny-invariant
-1.3.3 <https://github.com/alexreardon/tiny-invariant>
-MIT License
-
-Copyright (c) 2019 Alexander Reardon
-
-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.
-
-******************************
-
-tiny-secp256k1
-1.1.6 <https://github.com/bitcoinjs/tiny-secp256k1>
-MIT License
-
-Copyright (c) 2018 bitcoinjs contributors
+Copyright (c) 2018 bitcoinjs contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -27963,22 +28185,6 @@ to-data-view
 license: MIT
 authors: undefined
 
-******************************
-
-to-fast-properties
-2.0.0 <https://github.com/sindresorhus/to-fast-properties>
-MIT License
-
-Copyright (c) 2014 Petka Antonov
-              2015 Sindre Sorhus
-
-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.
-
-
 ******************************
 
 toggle-selection
@@ -27996,14 +28202,14 @@ authors: Sebastian Mayr <npm@smayr.name>
 ******************************
 
 @trezor/analytics
-1.0.16 <>
+1.2.0 <>
 license: Custom: https://data.trezor.io
 authors: undefined
 
 ******************************
 
 @trezor/blockchain-link
-2.1.28 <https://github.com/trezor/trezor-suite>
+2.3.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28059,21 +28265,21 @@ non-infringement.
 ******************************
 
 @trezor/blockchain-link-types
-1.0.15 <>
+1.2.0 <>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/blockchain-link-utils
-1.0.16 <>
+1.2.0 <>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/connect
-9.2.2 <https://github.com/trezor/trezor-suite>
+9.4.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28129,14 +28335,14 @@ non-infringement.
 ******************************
 
 @trezor/connect-analytics
-1.0.14 <>
+1.2.0 <>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/connect-common
-0.0.31 <https://github.com/trezor/trezor-suite>
+0.2.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28248,7 +28454,7 @@ non-infringement.
 ******************************
 
 @trezor/connect-web
-9.2.2 <https://github.com/trezor/trezor-suite>
+9.4.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28304,35 +28510,35 @@ non-infringement.
 ******************************
 
 @trezor/env-utils
-1.0.15 <https://github.com/trezor/trezor-suite>
+1.2.0 <https://github.com/trezor/trezor-suite>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/protobuf
-1.0.11 <https://github.com/trezor/trezor-suite>
-license: UNKNOWN
+1.2.0 <https://github.com/trezor/trezor-suite>
+license: Custom: https://github.com/trezor/trezor-firmware/tree/main/common/protob
 authors: undefined
 
 ******************************
 
 @trezor/protocol
-1.0.7 <https://github.com/trezor/trezor-suite>
+1.2.0 <https://github.com/trezor/trezor-suite>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/schema-utils
-1.0.3 <>
+1.2.0 <>
 license: Custom: https://github.com/sinclairzx81/typebox
 authors: undefined
 
 ******************************
 
 @trezor/transport
-1.1.27 <https://github.com/trezor/trezor-suite>
+1.3.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28388,14 +28594,14 @@ non-infringement.
 ******************************
 
 @trezor/type-utils
-1.0.5 <>
+1.1.0 <>
 license: UNKNOWN
 authors: undefined
 
 ******************************
 
 @trezor/utils
-9.0.23 <https://github.com/trezor/trezor-suite>
+9.2.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28451,7 +28657,7 @@ non-infringement.
 ******************************
 
 @trezor/utxo-lib
-2.0.8 <https://github.com/trezor/trezor-suite>
+2.2.0 <https://github.com/trezor/trezor-suite>
 # TREZOR REFERENCE SOURCE LICENSE (T-RSL)
 
 This license governs use of the accompanying software. If you use the software,
@@ -28560,328 +28766,91 @@ THE SOFTWARE.
 
 ******************************
 
-ts-interface-checker
-0.1.13 <https://github.com/gristlabs/ts-interface-checker>
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+tslib
+2.4.0 <https://github.com/Microsoft/tslib>
+Copyright (c) Microsoft Corporation.
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
 
-   1. Definitions.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+******************************
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+tslib
+2.6.2 <https://github.com/Microsoft/tslib>
+Copyright (c) Microsoft Corporation.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+******************************
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+ts-mixer
+6.0.4 <https://github.com/tannerntannern/ts-mixer>
+MIT License
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+Copyright (c) 2024 Tanner Nielsen
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+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:
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+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.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+******************************
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+tweetnacl
+1.0.3 <https://github.com/dchest/tweetnacl-js>
+This is free and unencumbered software released into the public domain.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-******************************
-
-tslib
-1.14.1 <https://github.com/Microsoft/tslib>
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************
-
-tslib
-2.6.2 <https://github.com/Microsoft/tslib>
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************
-
-ts-mixer
-6.0.4 <https://github.com/tannerntannern/ts-mixer>
-MIT License
-
-Copyright (c) 2024 Tanner Nielsen
-
-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.
-
-
-******************************
-
-tweetnacl
-1.0.3 <https://github.com/dchest/tweetnacl-js>
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-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 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.
-
-For more information, please refer to <http://unlicense.org>
-
-
-******************************
-
-tweetnacl-util
-0.15.1 <https://github.com/dchest/tweetnacl-util-js>
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-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 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.
+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 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.
 
 For more information, please refer to <http://unlicense.org>
 
@@ -28942,13 +28911,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-******************************
-
-type-fest
-4.15.0 <https://github.com/sindresorhus/type-fest>
-license: (MIT OR CC0-1.0)
-authors: Sindre Sorhus <sindresorhus@gmail.com>
-
 ******************************
 
 typeforce
@@ -29118,6 +29080,33 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
     SOFTWARE
 
 
+******************************
+
+@types/hoist-non-react-statics
+3.3.1 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    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
+
+
 ******************************
 
 @types/jsonwebtoken
@@ -29148,7 +29137,7 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 ******************************
 
 @types/lodash
-4.14.184 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+4.17.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
     MIT License
 
     Copyright (c) Microsoft Corporation.
@@ -29256,7 +29245,7 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 ******************************
 
 @types/node
-20.12.7 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+18.15.13 <https://github.com/DefinitelyTyped/DefinitelyTyped>
     MIT License
 
     Copyright (c) Microsoft Corporation.
@@ -29282,8 +29271,8 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 
 ******************************
 
-@types/pbkdf2
-3.1.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+@types/node
+20.16.11 <https://github.com/DefinitelyTyped/DefinitelyTyped>
     MIT License
 
     Copyright (c) Microsoft Corporation.
@@ -29309,11 +29298,11 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 
 ******************************
 
-@types/prop-types
-15.7.3 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+@types/pbkdf2
+3.1.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
     MIT License
 
-    Copyright (c) Microsoft Corporation. All rights reserved.
+    Copyright (c) Microsoft Corporation.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -29336,8 +29325,8 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 
 ******************************
 
-@types/punycode
-2.1.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+@types/prop-types
+15.7.3 <https://github.com/DefinitelyTyped/DefinitelyTyped>
     MIT License
 
     Copyright (c) Microsoft Corporation. All rights reserved.
@@ -29363,9 +29352,63 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
 
 ******************************
 
-@types/react
-16.9.53 <https://github.com/DefinitelyTyped/DefinitelyTyped>
-    MIT License
+@types/punycode
+2.1.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    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
+
+
+******************************
+
+@types/react
+16.9.53 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    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
+
+
+******************************
+
+@types/react-redux
+7.1.33 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
 
     Copyright (c) Microsoft Corporation.
 
@@ -29469,6 +29512,33 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
     SOFTWARE
 
 
+******************************
+
+@types/uuid
+10.0.0 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    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
+
+
 ******************************
 
 @types/uuid
@@ -29709,9 +29779,29 @@ SOFTWARE.
 ******************************
 
 undici-types
-5.26.5 <https://github.com/nodejs/undici>
-license: MIT
-authors: Daniele Belardi <https://github.com/dnlup>, Ethan Arrowood <https://github.com/ethan-arrowood>, Matteo Collina <https://github.com/mcollina>, Matthew Aitken <https://github.com/KhafraDev>, Robert Nagy <https://github.com/ronag>, Szymon Marczak <https://github.com/szmarczak>, Tomas Della Vedova <https://github.com/delvedor>
+6.19.8 <https://github.com/nodejs/undici>
+MIT License
+
+Copyright (c) Matteo Collina and Undici contributors
+
+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.
+
 
 ******************************
 
@@ -29965,7 +30055,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 update-browserslist-db
-1.0.13 <https://github.com/browserslist/update-db>
+1.1.1 <https://github.com/browserslist/update-db>
 The MIT License (MIT)
 
 Copyright 2022 Andrey Sitnik <andrey@sitnik.ru> and other contributors
@@ -30215,11 +30305,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************
 
-uuid
-7.0.3 <https://github.com/uuidjs/uuid>
-The MIT License (MIT)
+utility-types
+3.11.0 <https://github.com/piotrwitek/utility-types>
+MIT License
 
-Copyright (c) 2010-2016 Robert Kieffer and other contributors
+Copyright (c) 2016 Piotr Witek <piotrek.witek@gmail.com> (http://piotrwitek.github.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -30240,6 +30330,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+uuid
+10.0.0 <https://github.com/uuidjs/uuid>
+The MIT License (MIT)
+
+Copyright (c) 2010-2020 Robert Kieffer and other contributors
+
+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.
+
+
 ******************************
 
 uuid
@@ -30894,7 +30999,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 webextension-polyfill
-0.8.0 <https://github.com/mozilla/webextension-polyfill>
+0.12.0 <https://github.com/mozilla/webextension-polyfill>
 Mozilla Public License Version 2.0
 ==================================
 
@@ -31291,27 +31396,19 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ******************************
 
 websocket-driver
-0.7.0 <https://github.com/faye/websocket-driver-node>
-# The MIT License
-
-Copyright (c) 2010-2017 James Coglan
+0.7.4 <https://github.com/faye/websocket-driver-node>
+Copyright 2010-2020 James Coglan
 
-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:
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
 
 
 ******************************
@@ -31359,499 +31456,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-******************************
-
-which
-2.0.2 <https://github.com/isaacs/node-which>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 which-boxed-primitive
-1.0.2 <https://github.com/inspect-js/which-boxed-primitive>
-MIT License
-
-Copyright (c) 2019 Jordan Harband
-
-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.
-
-
-******************************
-
-which-collection
-1.0.1 <https://github.com/inspect-js/which-collection>
-MIT License
-
-Copyright (c) 2019 Inspect JS
-
-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.
-
-
-******************************
-
-which-typed-array
-1.1.9 <https://github.com/inspect-js/which-typed-array>
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-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.
-
-
-
-******************************
-
-wif
-4.0.0 <https://github.com/bitcoinjs/wif>
-The MIT License (MIT)
-
-Copyright (c) 2015 Daniel Cousens
-
-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.
-
-
-******************************
-
-wrap-ansi
-7.0.0 <https://github.com/chalk/wrap-ansi>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
-******************************
-
-wrap-ansi
-8.1.0 <https://github.com/chalk/wrap-ansi>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
-******************************
-
-wrappy
-1.0.2 <https://github.com/npm/wrappy>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-******************************
-
-write-file-atomic
-2.4.3 <https://github.com/iarna/write-file-atomic>
-Copyright (c) 2015, Rebecca Turner
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-
-******************************
-
-ws
-7.4.6 <https://github.com/websockets/ws>
-The MIT License (MIT)
-
-Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
-
-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.
-
-
-******************************
-
-ws
-7.5.9 <https://github.com/websockets/ws>
-The MIT License (MIT)
-
-Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
-
-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.
-
-
-******************************
-
-ws
-8.16.0 <https://github.com/websockets/ws>
-Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
-Copyright (c) 2013 Arnout Kazemier and contributors
-Copyright (c) 2016 Luigi Pinca and contributors
-
-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.
-
-
-******************************
-
-xcode
-3.0.1 <https://github.com/apache/cordova-node-xcode>
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-******************************
-
-xhr2
-0.2.1 <https://github.com/pwnall/node-xhr2>
-Copyright (c) 2013 Victor Costan
-
-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:
+1.0.2 <https://github.com/inspect-js/which-boxed-primitive>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+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.
@@ -31867,64 +31485,38 @@ SOFTWARE.
 
 ******************************
 
-xml
-1.0.1 <https://github.com/dylang/node-xml>
-(The MIT License)
-
-Copyright (c) 2011-2016 Dylan Greene <dylang@gmail.com>
-
-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.
-
-
-******************************
+which-collection
+1.0.1 <https://github.com/inspect-js/which-collection>
+MIT License
 
-xml2js
-0.6.0 <https://github.com/Leonidas-from-XIV/node-xml2js>
-Copyright 2010, 2011, 2012, 2013. All rights reserved.
+Copyright (c) 2019 Inspect JS
 
 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
+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 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.
+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.
 
 
 ******************************
 
-xmlbuilder
-11.0.1 <https://github.com/oozcitak/xmlbuilder-js>
+which-typed-array
+1.1.15 <https://github.com/inspect-js/which-typed-array>
 The MIT License (MIT)
 
-Copyright (c) 2013 Ozgur Ozcitak
+Copyright (c) 2015 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31933,25 +31525,26 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 
 
 ******************************
 
-xmlbuilder
-14.0.0 <https://github.com/oozcitak/xmlbuilder-js>
+wif
+4.0.0 <https://github.com/bitcoinjs/wif>
 The MIT License (MIT)
 
-Copyright (c) 2013 Ozgur Ozcitak
+Copyright (c) 2015 Daniel Cousens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31960,25 +31553,61 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+wrap-ansi
+7.0.0 <https://github.com/chalk/wrap-ansi>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+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.
+
+
+******************************
+
+wrappy
+1.0.2 <https://github.com/npm/wrappy>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
 ******************************
 
-xmlbuilder
-15.1.1 <https://github.com/oozcitak/xmlbuilder-js>
+ws
+7.5.10 <https://github.com/websockets/ws>
 The MIT License (MIT)
 
-Copyright (c) 2013 Ozgur Ozcitak
+Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31987,44 +31616,121 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ******************************
 
-@xmldom/xmldom
-0.7.13 <https://github.com/xmldom/xmldom>
-Copyright 2019 - present Christopher J. Brody and other contributors, as listed in: https://github.com/xmldom/xmldom/graphs/contributors
-Copyright 2012 - 2017 @jindw <jindw@xidea.org> and other contributors, as listed in: https://github.com/jindw/xmldom/graphs/contributors
+ws
+8.17.1 <https://github.com/websockets/ws>
+Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
+Copyright (c) 2013 Arnout Kazemier and contributors
+Copyright (c) 2016 Luigi Pinca and contributors
 
-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:
+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 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.
+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.
 
 
 ******************************
 
-@xmldom/xmldom
-0.8.10 <https://github.com/xmldom/xmldom>
-Copyright 2019 - present Christopher J. Brody and other contributors, as listed in: https://github.com/xmldom/xmldom/graphs/contributors
-Copyright 2012 - 2017 @jindw <jindw@xidea.org> and other contributors, as listed in: https://github.com/jindw/xmldom/graphs/contributors
+ws
+8.18.0 <https://github.com/websockets/ws>
+Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
+Copyright (c) 2013 Arnout Kazemier and contributors
+Copyright (c) 2016 Luigi Pinca and contributors
 
-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:
+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 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.
+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.
+
+
+******************************
+
+xhr2
+0.2.1 <https://github.com/pwnall/node-xhr2>
+Copyright (c) 2013 Victor Costan
+
+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.
+
+
+******************************
+
+xml
+1.0.1 <https://github.com/dylang/node-xml>
+(The MIT License)
+
+Copyright (c) 2011-2016 Dylan Greene <dylang@gmail.com>
+
+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.
 
 
 ******************************
@@ -32121,27 +31827,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-******************************
-
-yallist
-4.0.0 <https://github.com/isaacs/yallist>
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ******************************
 
 yargs
@@ -32189,25 +31874,10 @@ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-******************************
-
-yocto-queue
-0.1.0 <https://github.com/sindresorhus/yocto-queue>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-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.
-
-
 ******************************
 
 zod
-3.22.4 <https://github.com/colinhacks/zod>
+3.23.8 <https://github.com/colinhacks/zod>
 MIT License
 
 Copyright (c) 2020 Colin McDonnell

From ec359ed9ce1e4cffdccd580f22e524ed4ae2d5dd Mon Sep 17 00:00:00 2001
From: Harika <153644847+hjetpoluru@users.noreply.github.com>
Date: Fri, 15 Nov 2024 18:48:19 -0500
Subject: [PATCH 106/111] chore: Fix changelog title v12.8.0 (#28505)

<!--
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**

Updating the title in the changelog for v12.8.0 entries to help pass the
CI

<!--
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/28505?quickstart=1)
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d8c7f0683d..36b5649b3bf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.8.0]
-### Uncategorized
+### Fixed
 - chore: Master sync ([#28459](https://github.com/MetaMask/metamask-extension/pull/28459))
 - Merge origin/develop into master-sync
 - feat: Upgrade assets controllers to 43 with multichain polling for token lists + detection ([#28447](https://github.com/MetaMask/metamask-extension/pull/28447))

From 2d8473200ce510fde6ad041cdbb166c4093dfa43 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 21 Nov 2024 16:28:09 -0330
Subject: [PATCH 107/111] [cherry pick] chore: Reduce E2E test jobs run on PRs
 (#28525) (#28621)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #28525 for v12.8.0. This won't actually impact
the release candidate branch or release, but this is being cherry-picked
to reduce credit usage from cherry-pick PRs targeting this release. E2e
test runs from cherry-pick PRs aren't a major source of credit usage,
but these have been making it difficult for us to gauge how many
branches are still running these jobs "illegitimately" due to being
out-of-date. The hope is that after merging this, we can more easily
detect which branches need to be updated, and be able to evaluate the
success of this strategy in reducing credit usage.

Original description:

## **Description**

The number of E2E test jobs run on PRs has been reduced to save on
CircleCI credits. We still run the "chrome MV3" test job, but the
Firefox and "chrome MV2/webpack build" E2E test jobs are now only run on
`develop`, `master`, and RC branches. This should result in huge
CircleCI credit savings.

These jobs were chosen because it's uncommon for test failures or
flakiness to manifest in these jobs without also appearing in the Chrome
MV3 E2E test job, and this job represents the mmajority of our userbase
(the Chrome MV2/webpack build is only used for development).


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

## **Related issues**

This is intended to reduce credit usage. There is no linked issue.

## **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).
- [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.
---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70268a812421..7a81017489c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -197,6 +197,7 @@ workflows:
           requires:
             - prep-deps
       - test-e2e-chrome-webpack:
+          <<: *develop_master_rc_only
           requires:
             - prep-build-test-webpack
             - get-changed-files-with-git-diff
@@ -205,6 +206,7 @@ workflows:
             - prep-build-test
             - get-changed-files-with-git-diff
       - test-e2e-firefox:
+          <<: *develop_master_rc_only
           requires:
             - prep-build-test-mv2
             - get-changed-files-with-git-diff

From 5453b96a555fc86b00addcefd2007aed39826756 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 27 Nov 2024 11:37:56 -0330
Subject: [PATCH 108/111] Lint changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cec2a6d7f67..9cb8f9eee839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -203,6 +203,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - test: update notification date tests to be timezone agnostic ([#27925](https://github.com/MetaMask/metamask-extension/pull/27925))
 - fix: updated event name for site cell component ([#27981](https://github.com/MetaMask/metamask-extension/pull/27981))
 - fix(deps): gridplus-sdk@2.5.1->~2.6.0 ([#27973](https://github.com/MetaMask/metamask-extension/pull/27973))
+
+
 ## [12.7.2]
 ### Fixed
 - Fix message signatures for Gridplus lattice hardware wallets ([#28694](https://github.com/MetaMask/metamask-extension/pull/28694))
@@ -5554,9 +5556,7 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.8.0...HEAD
-[12.8.0]: https://github.com/MetaMask/metamask-extension/compare/v12.7.0...v12.8.0
-[12.7.0]: https://github.com/MetaMask/metamask-extension/compare/v12.6.1...v12.7.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.7.2...HEAD
+[12.8.0]: https://github.com/MetaMask/metamask-extension/compare/v12.7.2...v12.8.0
 [12.7.2]: https://github.com/MetaMask/metamask-extension/compare/v12.7.1...v12.7.2
 [12.7.1]: https://github.com/MetaMask/metamask-extension/compare/v12.7.0...v12.7.1
 [12.7.0]: https://github.com/MetaMask/metamask-extension/compare/v12.6.2...v12.7.0

From 0304023863503c2cd4b81720f2a8f0c520a99eb4 Mon Sep 17 00:00:00 2001
From: Harika <153644847+hjetpoluru@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:21:55 -0500
Subject: [PATCH 109/111] chore: Changelog v12.8.0 (#28692)

<!--
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 is to document changelog with v12.8.0 PR's
<!--
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/28692?quickstart=1)
---
 CHANGELOG.md | 254 ++++++++++++---------------------------------------
 1 file changed, 58 insertions(+), 196 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb8f9eee839..71056ec1113f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,202 +7,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.8.0]
-### Fixed
-- chore: Master sync ([#28459](https://github.com/MetaMask/metamask-extension/pull/28459))
-- Merge origin/develop into master-sync
-- feat: Upgrade assets controllers to 43 with multichain polling for token lists + detection ([#28447](https://github.com/MetaMask/metamask-extension/pull/28447))
-- Version v12.7.0 RC ([#28235](https://github.com/MetaMask/metamask-extension/pull/28235))
-- fix: display btc account creation while in settings ([#28379](https://github.com/MetaMask/metamask-extension/pull/28379))
-- fix: Fix race condition validating ERC20 transfer (blockaid) ([#28487](https://github.com/MetaMask/metamask-extension/pull/28487))
-- chore: fix test path on CI ([#28482](https://github.com/MetaMask/metamask-extension/pull/28482))
-- chore: Fix flaky ERC20 transfer blockaid e2e ([#28453](https://github.com/MetaMask/metamask-extension/pull/28453))
-- test: [POM] Migrate vault decryption e2e tests to TS and Page Object Model  ([#28419](https://github.com/MetaMask/metamask-extension/pull/28419))
-- feat: UI changes to show decoding data for permits ([#28342](https://github.com/MetaMask/metamask-extension/pull/28342))
-- chore:  V12.7.0 changelog ([#28458](https://github.com/MetaMask/metamask-extension/pull/28458))
-- chore: Merge master (as of v12.6.1) into v12.7.0 ([#28468](https://github.com/MetaMask/metamask-extension/pull/28468))
-- fix: dont poll token prices during onboarding or when locked ([#28465](https://github.com/MetaMask/metamask-extension/pull/28465))
-- Fixed lint
-- fix: Allow outerclick to close import modal ([#28448](https://github.com/MetaMask/metamask-extension/pull/28448))
-- Merge remote-tracking branch 'origin/master' into resolve-conflicts-v12.7.0-master
-- fix (cherry-pick): add simulation metrics when simulation UI is not visible (#28427) ([#28427](https://github.com/MetaMask/metamask-extension/pull/28427))
-- fix: ui customizations for redesigned transactions (#28443) ([#28443](https://github.com/MetaMask/metamask-extension/pull/28443))
-- feat: add simulation metrics when simulation UI is not visible ([#28427](https://github.com/MetaMask/metamask-extension/pull/28427))
-- fix: Fix attribution generation ([#28415](https://github.com/MetaMask/metamask-extension/pull/28415))
-- test: Improve test for signatures ([#27532](https://github.com/MetaMask/metamask-extension/pull/27532))
-- fix: ui customizations for redesigned transactions ([#28443](https://github.com/MetaMask/metamask-extension/pull/28443))
-- fix: Remove multiple overlapping spinners ([#28301](https://github.com/MetaMask/metamask-extension/pull/28301))
-- fix: Hide "interacting with" when simulated balance changes are shown ([#28409](https://github.com/MetaMask/metamask-extension/pull/28409))
-- chore: Begin introducing patterns for Multichain AssetList ([#28429](https://github.com/MetaMask/metamask-extension/pull/28429))
-- feat: update signature controller and integrate decoding api ([#28397](https://github.com/MetaMask/metamask-extension/pull/28397))
-- fix: Update PortfolioView flag ([#28446](https://github.com/MetaMask/metamask-extension/pull/28446))
-- perf: Create custom spans for account overview tabs ([#28086](https://github.com/MetaMask/metamask-extension/pull/28086))
-- fix: fix network client ID used on the useGasFeeInputs hook (#28391) ([#28391](https://github.com/MetaMask/metamask-extension/pull/28391))
-- fix (cherry-pick): get `supportedChains` to avoid blocking the confirmation process ([#28422](https://github.com/MetaMask/metamask-extension/pull/28422))
-- fix: Default to dApp suggested fees only when user selects the option ([#28403](https://github.com/MetaMask/metamask-extension/pull/28403))
-- feat: btc send flow e2e ([#28340](https://github.com/MetaMask/metamask-extension/pull/28340))
-- test: fix state fixtures race condition ([#28421](https://github.com/MetaMask/metamask-extension/pull/28421))
-- test: [POM] Migrate autodetect and import nft e2e tests to use Page Object Model ([#28383](https://github.com/MetaMask/metamask-extension/pull/28383))
-- chore(deps): bump `@metamask/eth-ledger-bridge-keyring` to `^5.0.1` ([#27688](https://github.com/MetaMask/metamask-extension/pull/27688))
-- chore: limit bridge quote request frequency and cancel requests ([#27237](https://github.com/MetaMask/metamask-extension/pull/27237))
-- test: Reintegrate refactored Swap e2e tests to the pipeline ([#26493](https://github.com/MetaMask/metamask-extension/pull/26493))
-- fix: fix network client ID used on the useGasFeeInputs hook ([#28391](https://github.com/MetaMask/metamask-extension/pull/28391))
-- ci: Fix `attributions:check` silent failure ([#28413](https://github.com/MetaMask/metamask-extension/pull/28413))
-- fix: `Test Snap Cronjob can trigger a cronjob to open a di...` flaky tests ([#28363](https://github.com/MetaMask/metamask-extension/pull/28363))
-- feat: add `account_type`/`snap_id` for buy/send metrics ([#28011](https://github.com/MetaMask/metamask-extension/pull/28011))
-- fix: get `supportedChains` to avoid blocking the confirmation process ([#28313](https://github.com/MetaMask/metamask-extension/pull/28313))
-- test: [POM] Migrate reveal account srp e2e tests to use Page Object Model ([#28354](https://github.com/MetaMask/metamask-extension/pull/28354))
-- fix: Add metric trait for privacy mode ([#28335](https://github.com/MetaMask/metamask-extension/pull/28335))
-- fix: Properly ellipsize long token names ([#28392](https://github.com/MetaMask/metamask-extension/pull/28392))
-- fix(snaps): Patch `@metamask/snaps-utils` ([#28377](https://github.com/MetaMask/metamask-extension/pull/28377))
-- fix: cherry-pick: Return to send page with different asset types ([#28384](https://github.com/MetaMask/metamask-extension/pull/28384))
-- chore: Bump snaps-utils ([#28399](https://github.com/MetaMask/metamask-extension/pull/28399))
-- feat: migrate MetaMetricsController to BaseControllerV2 ([#28113](https://github.com/MetaMask/metamask-extension/pull/28113))
-- feat: change expand icon per new design ([#28267](https://github.com/MetaMask/metamask-extension/pull/28267))
-- chore: add unit test for `useMultiPolling` ([#28387](https://github.com/MetaMask/metamask-extension/pull/28387))
-- feat(Solana): add "Add a new Solana account" link to the account creation dialog ([#28270](https://github.com/MetaMask/metamask-extension/pull/28270))
-- fix: Return to send page with different asset types ([#28382](https://github.com/MetaMask/metamask-extension/pull/28382))
-- cherry-pick: bump `@metamask/queued-request-controller` with patch fix (#28355) ([#28355](https://github.com/MetaMask/metamask-extension/pull/28355))
-- test: [POM] Refactor import account e2e tests to use Page Object Model ([#28325](https://github.com/MetaMask/metamask-extension/pull/28325))
-- feat(1852): Implement sentry user report on error screen ([#27857](https://github.com/MetaMask/metamask-extension/pull/27857))
-- fix: disable buy for btc testnet accounts ([#28341](https://github.com/MetaMask/metamask-extension/pull/28341))
-- fix: Address design review for ERC20 token send ([#28212](https://github.com/MetaMask/metamask-extension/pull/28212))
-- refactor: remove global network usage from transaction confirmations ([#28236](https://github.com/MetaMask/metamask-extension/pull/28236))
-- build: update yarn to v4.5.1 ([#28365](https://github.com/MetaMask/metamask-extension/pull/28365))
-- fix: Bug 28347 - Privacy mode tweaks (#28367) ([#28367](https://github.com/MetaMask/metamask-extension/pull/28367))
-- fix: Bug 28347 - Privacy mode tweaks ([#28367](https://github.com/MetaMask/metamask-extension/pull/28367))
-- fix: mv2 firefox csp header ([#27770](https://github.com/MetaMask/metamask-extension/pull/27770))
-- perf: ensure `setupLocale` doesn't fetch `_locales/en/messages.json` twice ([#26553](https://github.com/MetaMask/metamask-extension/pull/26553))
-- fix: bump `@metamask/queued-request-controller` with patch fix ([#28355](https://github.com/MetaMask/metamask-extension/pull/28355))
-- fix (Cherrypick v12.7.0 ): disable account syncing ([#28361](https://github.com/MetaMask/metamask-extension/pull/28361))
-- fix: Revert "fix: Negate privacy mode in Send screen" ([#28360](https://github.com/MetaMask/metamask-extension/pull/28360))
-- fix: disable account syncing ([#28359](https://github.com/MetaMask/metamask-extension/pull/28359))
-- Cherrypick v12.7.0 feat: Add simulation metrics to "Transaction Submitted" and "Transaction Finalized" events  ([#28314](https://github.com/MetaMask/metamask-extension/pull/28314))
-- feat: Convert mmi controller to a non-controller ([#27983](https://github.com/MetaMask/metamask-extension/pull/27983))
-- Cherrypick v12.7.0 feat: Enable simulation metrics for redesign transactions ([#28324](https://github.com/MetaMask/metamask-extension/pull/28324))
-- cherry pick: chore: add the gas_included prop into Quotes Received event ([#28351](https://github.com/MetaMask/metamask-extension/pull/28351))
-- cherry pick: fix: smart transactions in redesigned confirmations ([#28353](https://github.com/MetaMask/metamask-extension/pull/28353))
-- fix: Updates to the simulations component ([#28107](https://github.com/MetaMask/metamask-extension/pull/28107))
-- refactor: rename SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS_FALLBACK_LIST ([#28337](https://github.com/MetaMask/metamask-extension/pull/28337))
-- chore: adds Solana snap to preinstall list ([#28141](https://github.com/MetaMask/metamask-extension/pull/28141))
-- feat: Show network badge in detected tokens modal ([#28231](https://github.com/MetaMask/metamask-extension/pull/28231))
-- fix: Negate privacy mode in Send screen ([#28248](https://github.com/MetaMask/metamask-extension/pull/28248))
-- feat: adds solana feature, code fence ([#28320](https://github.com/MetaMask/metamask-extension/pull/28320))
-- build(webpack): fix cache issues in webpack build by updating `html-bundler-webpack-plugin` to v4.4.1 ([#28225](https://github.com/MetaMask/metamask-extension/pull/28225))
-- feat: team-label-token ([#28134](https://github.com/MetaMask/metamask-extension/pull/28134))
-- chore: add Solana shared utilities and constants ([#28269](https://github.com/MetaMask/metamask-extension/pull/28269))
-- chore: Remove STX opt in modal ([#28291](https://github.com/MetaMask/metamask-extension/pull/28291))
-- chore: revert commit `3da34f4` (feat: btc e2e tests (#27986)) ([#27986](https://github.com/MetaMask/metamask-extension/pull/27986))
-- chore: e2e quality gate enhancement ([#28206](https://github.com/MetaMask/metamask-extension/pull/28206))
-- chore: adding e2e tests for NFT permit ([#28004](https://github.com/MetaMask/metamask-extension/pull/28004))
-- feat: Enable simulation metrics for redesign transactions ([#28280](https://github.com/MetaMask/metamask-extension/pull/28280))
-- fix: GasDetailItem invalid paddingStart prop ([#28281](https://github.com/MetaMask/metamask-extension/pull/28281))
-- fix: use transaction address to get lock for custom nonce ([#28272](https://github.com/MetaMask/metamask-extension/pull/28272))
-- fix: flaky test `Phishing Detection Via Iframe should redirect users to the the MetaMask Phishing Detection page when an iframe domain is on the phishing blocklist` ([#28293](https://github.com/MetaMask/metamask-extension/pull/28293))
-- chore: add the gas_included prop into Quotes Requested event ([#28295](https://github.com/MetaMask/metamask-extension/pull/28295))
-- test: [POM] Refactor e2e tests to use onboarding flows defined in Page Object Models ([#28202](https://github.com/MetaMask/metamask-extension/pull/28202))
-- feat: btc e2e tests ([#27986](https://github.com/MetaMask/metamask-extension/pull/27986))
-- fix: remove scroll-to-bottom requirement in redesigned transaction confirmations ([#27910](https://github.com/MetaMask/metamask-extension/pull/27910))
-- chore: Add gravity logo and image mappings ([#28306](https://github.com/MetaMask/metamask-extension/pull/28306))
-- chore: Bump Snaps packages ([#28215](https://github.com/MetaMask/metamask-extension/pull/28215))
-- feat: Add simulation metrics to "Transaction Submitted" and "Transaction Finalized" events ([#28240](https://github.com/MetaMask/metamask-extension/pull/28240))
-- fix: smart transactions in redesigned confirmations ([#28273](https://github.com/MetaMask/metamask-extension/pull/28273))
-- fix: unit flaky test `AddContact component › should disable submit button when input is not a valid address` ([#27941](https://github.com/MetaMask/metamask-extension/pull/27941))
-- fix: Hide fiat values on test networks ([#28219](https://github.com/MetaMask/metamask-extension/pull/28219))
-- chore: display bridge quotes ([#28031](https://github.com/MetaMask/metamask-extension/pull/28031))
-- fix: Permit message, dataTree value incorrectly using default ERC20 decimals for non-ERC20 token values ([#28142](https://github.com/MetaMask/metamask-extension/pull/28142))
-- fix: ignore error when getTokenStandardAndDetails fails ([#28030](https://github.com/MetaMask/metamask-extension/pull/28030))
-- fix: notification settings type ([#28271](https://github.com/MetaMask/metamask-extension/pull/28271))
-- chore: use accounts api for token detection ([#28254](https://github.com/MetaMask/metamask-extension/pull/28254))
-- fix: Fix alignment of long RPC labels in Networks menu ([#28244](https://github.com/MetaMask/metamask-extension/pull/28244))
-- feat: adds the experimental toggle for Solana  ([#28190](https://github.com/MetaMask/metamask-extension/pull/28190))
-- feat: multi chain polling for token prices ([#28158](https://github.com/MetaMask/metamask-extension/pull/28158))
-- refactor: move `getInternalAccounts` from `selectors.js` to `accounts.ts` ([#27645](https://github.com/MetaMask/metamask-extension/pull/27645))
-- fix: Add different copy for tooltip when a snap is requesting a signature ([#27492](https://github.com/MetaMask/metamask-extension/pull/27492))
-- fix: Prevent coercing symbols to zero in the edit spending cap modal ([#28192](https://github.com/MetaMask/metamask-extension/pull/28192))
-- test: [POM] Migrate edit network rpc e2e tests and create related page class functions ([#28161](https://github.com/MetaMask/metamask-extension/pull/28161))
-- refactor: remove global network usage from signatures ([#28167](https://github.com/MetaMask/metamask-extension/pull/28167))
-- fix: margin on asset chart min/max indicators ([#27916](https://github.com/MetaMask/metamask-extension/pull/27916))
-- feat: add token verification source count and link to block explorer ([#27759](https://github.com/MetaMask/metamask-extension/pull/27759))
-- chore: Remove obsolete preview build support ([#27968](https://github.com/MetaMask/metamask-extension/pull/27968))
-- fix: Removing `warning` prop from settings ([#27990](https://github.com/MetaMask/metamask-extension/pull/27990))
-- chore: Adding installType to Sentry Tags for easy filtering ([#28084](https://github.com/MetaMask/metamask-extension/pull/28084))
-- chore: remove broken link in docs ([#28232](https://github.com/MetaMask/metamask-extension/pull/28232))
-- fix: Error handling for the state log download failure ([#26999](https://github.com/MetaMask/metamask-extension/pull/26999))
-- feat: Upgrade alert controller to base controller v2 ([#28054](https://github.com/MetaMask/metamask-extension/pull/28054))
-- chore: improve token lookup performance in `useAccountTotalFiatBalance` ([#28233](https://github.com/MetaMask/metamask-extension/pull/28233))
-- chore: Modify changelog title to fix ci job  ([#28237](https://github.com/MetaMask/metamask-extension/pull/28237))
-- Version v12.7.0
-- chore: Master sync ([#28222](https://github.com/MetaMask/metamask-extension/pull/28222))
-- Merge origin/develop into master-sync
-- refactor: move `getSelectedInternalAccount` from `selectors.js` to `accounts.ts` ([#27644](https://github.com/MetaMask/metamask-extension/pull/27644))
-- feat: Improve provider method metrics for add/switch chain ([#28214](https://github.com/MetaMask/metamask-extension/pull/28214))
-- fix: Fix left-aligned fullscreen UI ([#28218](https://github.com/MetaMask/metamask-extension/pull/28218))
-- test: add ui render for debug ui integration tests ([#27621](https://github.com/MetaMask/metamask-extension/pull/27621))
-- feat: poll native currency prices across chains ([#28196](https://github.com/MetaMask/metamask-extension/pull/28196))
-- test: Fix data deletion e2e tests ([#28221](https://github.com/MetaMask/metamask-extension/pull/28221))
-- chore: Add a new transaction event prop ([#28153](https://github.com/MetaMask/metamask-extension/pull/28153))
-- feat: Copy updates to satisfy UK regulation requirements ([#28157](https://github.com/MetaMask/metamask-extension/pull/28157))
-- fix: flaky test `BTC Account - Overview has balance` ([#28181](https://github.com/MetaMask/metamask-extension/pull/28181))
-- chore: poll for bridge quotes ([#28029](https://github.com/MetaMask/metamask-extension/pull/28029))
-- chore: update confirmations code ownership ([#27862](https://github.com/MetaMask/metamask-extension/pull/27862))
-- feat(snaps): Add `useDisplayName` hook ([#27868](https://github.com/MetaMask/metamask-extension/pull/27868))
-- chore: upgrade signature controller to remove global network ([#28063](https://github.com/MetaMask/metamask-extension/pull/28063))
-- chore: update bridge quote request on input change ([#28028](https://github.com/MetaMask/metamask-extension/pull/28028))
-- chore: bump asset controllers to 39 + polling API ([#28025](https://github.com/MetaMask/metamask-extension/pull/28025))
-- fix: incorrect standard swap gas fee estimation ([#28127](https://github.com/MetaMask/metamask-extension/pull/28127))
-- feat: Capture 3 existing properties within non-anonymous transaction … ([#28144](https://github.com/MetaMask/metamask-extension/pull/28144))
-- refactor: remove global network usage from transaction simulation ([#27895](https://github.com/MetaMask/metamask-extension/pull/27895))
-- test(ramps): fixes btc native token test ([#27601](https://github.com/MetaMask/metamask-extension/pull/27601))
-- refactor: clean up profile sync hooks ([#28132](https://github.com/MetaMask/metamask-extension/pull/28132))
-- chore: ignore warning for ethereumjs-wallet ([#28145](https://github.com/MetaMask/metamask-extension/pull/28145))
-- test: [Snaps E2E] Unified methods and clean up snaps e2e tests ([#27684](https://github.com/MetaMask/metamask-extension/pull/27684))
-- chore: update @metamask/bitcoin-wallet-snap to 0.8.2 ([#28135](https://github.com/MetaMask/metamask-extension/pull/28135))
-- chore: small storybook and docs updates to SensitiveText component ([#28089](https://github.com/MetaMask/metamask-extension/pull/28089))
-- chore: bridge-api fetchBridgeQuotes util ([#28027](https://github.com/MetaMask/metamask-extension/pull/28027))
-- feat: update phishing controller version ([#28131](https://github.com/MetaMask/metamask-extension/pull/28131))
-- fix: broken not existing type file import ([#28055](https://github.com/MetaMask/metamask-extension/pull/28055))
-- test: blockaid update version and reenable specs ([#28121](https://github.com/MetaMask/metamask-extension/pull/28121))
-- test: [POM] Migrate onboarding infura call privacy e2e tests  ([#28079](https://github.com/MetaMask/metamask-extension/pull/28079))
-- feat: share the same user storage mock instance in tests ([#28119](https://github.com/MetaMask/metamask-extension/pull/28119))
-- chore: Using button icon component for clikable icons ([#28082](https://github.com/MetaMask/metamask-extension/pull/28082))
-- feat: convert MetaMetricsController to typescript ([#28072](https://github.com/MetaMask/metamask-extension/pull/28072))
-- feat: improved way to trigger mmi e2e tests ([#27932](https://github.com/MetaMask/metamask-extension/pull/27932))
-- test: allow more simple findElement by data-testid ([#28065](https://github.com/MetaMask/metamask-extension/pull/28065))
-- fix: json-rpc-middleware-stream@^5 -> @metamask/json-rpc-middleware-stream@^8 ([#28060](https://github.com/MetaMask/metamask-extension/pull/28060))
-- fix(devDeps): babel@7.23.2->7.25.9 ([#28068](https://github.com/MetaMask/metamask-extension/pull/28068))
-- feat: better storybook stories for the notification pages ([#27861](https://github.com/MetaMask/metamask-extension/pull/27861))
-- fix: update storybook to support NFT images ([#28105](https://github.com/MetaMask/metamask-extension/pull/28105))
-- fix: broken test `Vault Decryptor Page is able to decrypt the vault uploading the log file in the vault-decryptor webapp` ([#28098](https://github.com/MetaMask/metamask-extension/pull/28098))
-- test: Complete missing step for add a contact to the address book in existing E2E test ([#27959](https://github.com/MetaMask/metamask-extension/pull/27959))
-- feat(3419): sensitive text component ([#28056](https://github.com/MetaMask/metamask-extension/pull/28056))
-- test: Added e2e for switch network ([#27967](https://github.com/MetaMask/metamask-extension/pull/27967))
-- fix: c2 bypass ([#28057](https://github.com/MetaMask/metamask-extension/pull/28057))
-- test: NOTIFY-1256 - Extending E2E tests for Account Sync ([#28067](https://github.com/MetaMask/metamask-extension/pull/28067))
-- test: notifications integration tests ([#28022](https://github.com/MetaMask/metamask-extension/pull/28022))
-- chore: update stories for name component ([#28049](https://github.com/MetaMask/metamask-extension/pull/28049))
-- fix: flaky anti-pattern getText + assert 3 ([#28062](https://github.com/MetaMask/metamask-extension/pull/28062))
-- test: [POM] Create onboarding related page object modal base pages and migrate e2e tests  ([#28036](https://github.com/MetaMask/metamask-extension/pull/28036))
-- docs: update debugging sentry step 3 ([#28034](https://github.com/MetaMask/metamask-extension/pull/28034))
-- fix: Support dynamic native token name on gas component ([#28048](https://github.com/MetaMask/metamask-extension/pull/28048))
-- fix: Fall back to token list for the token symbol ([#28003](https://github.com/MetaMask/metamask-extension/pull/28003))
-- fix: flaky anti-pattern getText + assert 2 ([#28043](https://github.com/MetaMask/metamask-extension/pull/28043))
-- fix(deps): @metamask/eth-json-rpc-filters@^8.0.0->^9.0.0 ([#27956](https://github.com/MetaMask/metamask-extension/pull/27956))
-- chore: Bump gridplus-sdk to 2.7.1 ([#28008](https://github.com/MetaMask/metamask-extension/pull/28008))
-- fix(deps): @keystonehq/metamask-airgapped-keyring@^0.13.1->^0.14.1 ([#27952](https://github.com/MetaMask/metamask-extension/pull/27952))
-- refactor: use `reselect`'s `createSelector` instead of going through `@redux/toolkit`, as the import names collide when trying to merge files. ([#27643](https://github.com/MetaMask/metamask-extension/pull/27643))
-- fix: storybook `getManifest` issue ([#28010](https://github.com/MetaMask/metamask-extension/pull/28010))
-- feat: bump @metamask/notification-services-controller from 0.7.0 to 0.11.0 ([#28017](https://github.com/MetaMask/metamask-extension/pull/28017))
-- refactor: remove global network usage from petnames ([#27946](https://github.com/MetaMask/metamask-extension/pull/27946))
-- chore: updated package ([#28002](https://github.com/MetaMask/metamask-extension/pull/28002))
-- feat(NOTIFY-1245): add account syncing E2E helpers & basic tests ([#28005](https://github.com/MetaMask/metamask-extension/pull/28005))
-- fix: Fix stream re-initialization ([#28024](https://github.com/MetaMask/metamask-extension/pull/28024))
-- refactor: routes.component.js and creation of ToastMaster ([#27735](https://github.com/MetaMask/metamask-extension/pull/27735))
-- fix: @metamask/eth-json-rpc-filters@^7.0.0->^8.0.0 ([#27917](https://github.com/MetaMask/metamask-extension/pull/27917))
-- refactor: remove relative imports to `selectors/index.js` from other selectors files ([#27642](https://github.com/MetaMask/metamask-extension/pull/27642))
-- refactor: remove circular dependency between `ui/ducks/custom-gas.js` and `ui/selectors/index.js` ([#27640](https://github.com/MetaMask/metamask-extension/pull/27640))
-- test: update notification date tests to be timezone agnostic ([#27925](https://github.com/MetaMask/metamask-extension/pull/27925))
-- fix: updated event name for site cell component ([#27981](https://github.com/MetaMask/metamask-extension/pull/27981))
-- fix(deps): gridplus-sdk@2.5.1->~2.6.0 ([#27973](https://github.com/MetaMask/metamask-extension/pull/27973))
+### Added
+- Added multi-chain polling for token prices ([#28158](https://github.com/MetaMask/metamask-extension/pull/28158))
+- Added account_type/snap_id for buy/send metrics ([#28011](https://github.com/MetaMask/metamask-extension/pull/28011))
+- Made UI changes to show decoding data for permits ([#28342](https://github.com/MetaMask/metamask-extension/pull/28342))
+- Implemented Sentry user report on error screen ([#27857](https://github.com/MetaMask/metamask-extension/pull/27857))
+- Showed network badge in detected tokens modal ([#28231](https://github.com/MetaMask/metamask-extension/pull/28231))
+- Migrated MetaMetricsController to BaseControllerV2 ([#28113](https://github.com/MetaMask/metamask-extension/pull/28113))
+- Converted MMI controller to a non-controller ([#27983](https://github.com/MetaMask/metamask-extension/pull/27983))
+- Upgraded alert controller to BaseControllerV2 ([#28054](https://github.com/MetaMask/metamask-extension/pull/28054))
+- Added token verification source count and link to block explorer ([#27759](https://github.com/MetaMask/metamask-extension/pull/27759))
+- Added "Add a new Solana account" link to the account creation dialog ([#28270](https://github.com/MetaMask/metamask-extension/pull/28270))
+- Added Solana snap to preinstall list ([#28141](https://github.com/MetaMask/metamask-extension/pull/28141))
+- Added the experimental toggle for Solana ([#28190](https://github.com/MetaMask/metamask-extension/pull/28190))
+- Added gravity logo and image mappings ([#28306](https://github.com/MetaMask/metamask-extension/pull/28306))
+- Used accounts API for token detection ([#28254](https://github.com/MetaMask/metamask-extension/pull/28254))
+- Displayed bridge quotes ([#28031](https://github.com/MetaMask/metamask-extension/pull/28031))
+
+### Changed
+- Upgraded assets controllers to version 43 with multi-chain polling for token lists and detection which allows for more efficient and accurate tracking of tokens across multiple chains ([#28447](https://github.com/MetaMask/metamask-extension/pull/28447))
+- Changed expand icon to align with the new design, improving the user interface and overall user experience ([#28267](https://github.com/MetaMask/metamask-extension/pull/28267))
+- Prevented polling of token prices during onboarding or when the wallet is locked, ensuring that unnecessary network requests are avoided. ([#28465](https://github.com/MetaMask/metamask-extension/pull/28465))
+- Disabled the buy feature for BTC testnet accounts to prevent users from attempting to purchase BTC on test networks ([#28341](https://github.com/MetaMask/metamask-extension/pull/28341))
+- Removed the warning prop from settings to clean up the code and prevent potential issues ([#27990](https://github.com/MetaMask/metamask-extension/pull/27990))
+- Improved error handling for state log download failures, providing better feedback and stability when issues occur ([#26999](https://github.com/MetaMask/metamask-extension/pull/26999))
+- Improved token lookup performance in useAccountTotalFiatBalance, enhancing the speed and efficiency of balance calculations ([#28233](https://github.com/MetaMask/metamask-extension/pull/28233))
+- Limited the frequency of bridge quote requests and added functionality to cancel requests, reducing unnecessary network traffic and improving performance ([#27237](https://github.com/MetaMask/metamask-extension/pull/27237))
+- Bumped Snaps packages to the latest versions, ensuring compatibility and leveraging new features and fixes ([#28215](https://github.com/MetaMask/metamask-extension/pull/28215))
+- Removed the STX opt-in modal to streamline the user experience and reduce unnecessary prompts ([#28291](https://github.com/MetaMask/metamask-extension/pull/28291))
+- Added the gas_included prop into the Quotes Requested event, providing more detailed and accurate event tracking for gas usage ([#28295](https://github.com/MetaMask/metamask-extension/pull/28295))
+
+### Fixed
+- Fixed network client ID used on the useGasFeeInputs hook ([#28391](https://github.com/MetaMask/metamask-extension/pull/28391))
+- Ignored error when getTokenStandardAndDetails fails ([#[28030](https://github.com/MetaMask/metamask-extension/pull/28030)])
+- Adjusted margin on asset chart min/max indicators ([#[27916](https://github.com/MetaMask/metamask-extension/pull/27916)])
+- Removed multiple overlapping spinners ([#[28301](https://github.com/MetaMask/metamask-extension/pull/28301)])
+- Hid "interacting with" when simulated balance changes are shown ([#[28409](https://github.com/MetaMask/metamask-extension/pull/28409)])
+- Ensured supportedChains does not block the confirmation process ([#[28313](https://github.com/MetaMask/metamask-extension/pull/28313)])
+- Returned to send page with different asset types ([#[28382](https://github.com/MetaMask/metamask-extension/pull/28382)])
+- Addressed design review for ERC20 token send ([#[28212](https://github.com/MetaMask/metamask-extension/pull/28212)])
+- Improved gas limit estimation ([#[28327](https://github.com/MetaMask/metamask-extension/pull/28327)])
+- Updated simulations component ([#[28107](https://github.com/MetaMask/metamask-extension/pull/28107)])
+- Used transaction address to get lock for custom nonce ([#[28272](https://github.com/MetaMask/metamask-extension/pull/28272)])
+- Removed scroll-to-bottom requirement in redesigned transaction confirmations ([#[27910](https://github.com/MetaMask/metamask-extension/pull/27910)])
+- Hid fiat values on test networks ([#[28219](https://github.com/MetaMask/metamask-extension/pull/28219)])
+- Corrected Permit message dataTree value using default ERC20 decimals for non-ERC20 token values ([#[28142](https://github.com/MetaMask/metamask-extension/pull/28142)])
+- Prevented coercing symbols to zero in the edit spending cap modal ([#[28192](https://github.com/MetaMask/metamask-extension/pull/28192)])
+- Fixed MV2 Firefox CSP header ([#[27770](https://github.com/MetaMask/metamask-extension/pull/27770)])
+- Allowed outer click to close import modal ([#[28448](https://github.com/MetaMask/metamask-extension/pull/28448)])
+- Updated PortfolioView flag ([#[28446](https://github.com/MetaMask/metamask-extension/pull/28446)])
+- Added metric trait for privacy mode ([#[28335](https://github.com/MetaMask/metamask-extension/pull/28335)])
+- Properly ellipsized long token names ([#[28392](https://github.com/MetaMask/metamask-extension/pull/28392)])
+- Reverted "fix: Negate privacy mode in Send screen" ([#[28360](https://github.com/MetaMask/metamask-extension/pull/28360)])
+- Fixed alignment of long RPC labels in Networks menu ([#[28244](https://github.com/MetaMask/metamask-extension/pull/28244)])
+- Fixed attribution generation ([#[28415](https://github.com/MetaMask/metamask-extension/pull/28415)])
+- Added different copy for tooltip when a snap is requesting a signature ([#[27492](https://github.com/MetaMask/metamask-extension/pull/27492)])
+- Bumped @metamask/queued-request-controller with patch fix ([#[28355](https://github.com/MetaMask/metamask-extension/pull/28355)])
+- Corrected notification settings type ([[#28271](https://github.com/MetaMask/metamask-extension/pull/28271)])
+- Improved performance to Ensured setupLocale doesn't fetch _locales/en/messages.json twice ([[#26553](https://github.com/MetaMask/metamask-extension/pull/26553)])
 
 
 ## [12.7.2]

From 8e074a60b4b97d0d31b3259048dc333792029716 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Mon, 2 Dec 2024 13:26:37 -0800
Subject: [PATCH 110/111] fix(cherry-pick): use PORTFOLIO_VIEW flag to
 determine chain polling (#28578)

Cherry picks https://github.com/MetaMask/metamask-extension/pull/28504
to 12.8.0 so chains aren't polled unnecessarily

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 ui/hooks/useTokenDetectionPolling.ts |  8 +++++++-
 ui/hooks/useTokenRatesPolling.ts     | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/hooks/useTokenDetectionPolling.ts b/ui/hooks/useTokenDetectionPolling.ts
index 790384e21cbf..d2e08d01892d 100644
--- a/ui/hooks/useTokenDetectionPolling.ts
+++ b/ui/hooks/useTokenDetectionPolling.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
 import {
+  getCurrentChainId,
   getNetworkConfigurationsByChainId,
   getUseTokenDetection,
 } from '../selectors';
@@ -17,14 +18,19 @@ const useTokenDetectionPolling = () => {
   const useTokenDetection = useSelector(getUseTokenDetection);
   const completedOnboarding = useSelector(getCompletedOnboarding);
   const isUnlocked = useSelector(getIsUnlocked);
+  const currentChainId = useSelector(getCurrentChainId);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
   const enabled = completedOnboarding && isUnlocked && useTokenDetection;
 
+  const chainIds = process.env.PORTFOLIO_VIEW
+    ? Object.keys(networkConfigurations)
+    : [currentChainId];
+
   useMultiPolling({
     startPolling: tokenDetectionStartPolling,
     stopPollingByPollingToken: tokenDetectionStopPollingByPollingToken,
-    input: enabled ? [Object.keys(networkConfigurations)] : [],
+    input: enabled ? [chainIds] : [],
   });
 
   return {};
diff --git a/ui/hooks/useTokenRatesPolling.ts b/ui/hooks/useTokenRatesPolling.ts
index a740a426e36c..37864ec89b82 100644
--- a/ui/hooks/useTokenRatesPolling.ts
+++ b/ui/hooks/useTokenRatesPolling.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
 import {
+  getCurrentChainId,
   getMarketData,
   getNetworkConfigurationsByChainId,
   getTokenExchangeRates,
@@ -16,10 +17,11 @@ import {
 } from '../ducks/metamask/metamask';
 import useMultiPolling from './useMultiPolling';
 
-const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
+const useTokenRatesPolling = () => {
   // Selectors to determine polling input
   const completedOnboarding = useSelector(getCompletedOnboarding);
   const isUnlocked = useSelector(getIsUnlocked);
+  const currentChainId = useSelector(getCurrentChainId);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
@@ -30,10 +32,14 @@ const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
 
   const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
 
+  const chainIds = process.env.PORTFOLIO_VIEW
+    ? Object.keys(networkConfigurations)
+    : [currentChainId];
+
   useMultiPolling({
     startPolling: tokenRatesStartPolling,
     stopPollingByPollingToken: tokenRatesStopPollingByPollingToken,
-    input: enabled ? chainIds ?? Object.keys(networkConfigurations) : [],
+    input: enabled ? chainIds : [],
   });
 
   return {

From d909bde8ead2447f4746e1b435ad71179df4ec88 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Mon, 2 Dec 2024 16:12:59 -0800
Subject: [PATCH 111/111] fix(cherry-pick): use PORTFOLIO_VIEW flag to
 determine token list polling (#28585)

Cherry picks https://github.com/MetaMask/metamask-extension/pull/28579
to 12.8.0 so chains aren't polled unnecessarily

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 ...rs-after-init-opt-in-background-state.json |  6 +-----
 .../errors-after-init-opt-in-ui-state.json    |  6 +-----
 ui/hooks/useTokenListPolling.test.ts          | 21 +++++++++++--------
 ui/hooks/useTokenListPolling.ts               |  8 ++++++-
 4 files changed, 21 insertions(+), 20 deletions(-)

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 999dce99ca0c..9b0571e204d5 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
@@ -317,11 +317,7 @@
   "TokenListController": {
     "tokenList": "object",
     "tokensChainsCache": {
-      "0x1": "object",
-      "0x539": "object",
-      "0xaa36a7": "object",
-      "0xe705": "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 acd9d6f8d074..60125eaa8d5f 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
@@ -175,11 +175,7 @@
     "nonRPCGasFeeApisDisabled": "boolean",
     "tokenList": "object",
     "tokensChainsCache": {
-      "0x1": "object",
-      "0x539": "object",
-      "0xaa36a7": "object",
-      "0xe705": "object",
-      "0xe708": "object"
+      "0x539": "object"
     },
     "preventPollingOnNetworkRestart": false,
     "tokens": "object",
diff --git a/ui/hooks/useTokenListPolling.test.ts b/ui/hooks/useTokenListPolling.test.ts
index 09a22fffea50..001dca71c80e 100644
--- a/ui/hooks/useTokenListPolling.test.ts
+++ b/ui/hooks/useTokenListPolling.test.ts
@@ -22,16 +22,23 @@ describe('useTokenListPolling', () => {
     jest.clearAllMocks();
   });
 
-  it('should poll for token lists on each chain when enabled, and stop on dismount', async () => {
+  it('should poll the selected network when enabled, and stop on dismount', async () => {
     const state = {
       metamask: {
         isUnlocked: true,
         completedOnboarding: true,
         useExternalServices: true,
         useTokenDetection: true,
+        selectedNetworkClientId: 'selectedNetworkClientId',
         networkConfigurationsByChainId: {
-          '0x1': {},
-          '0x89': {},
+          '0x1': {
+            chainId: '0x1',
+            rpcEndpoints: [
+              {
+                networkClientId: 'selectedNetworkClientId',
+              },
+            ],
+          },
         },
       },
     };
@@ -43,19 +50,15 @@ describe('useTokenListPolling', () => {
 
     // Should poll each chain
     await Promise.all(mockPromises);
-    expect(tokenListStartPolling).toHaveBeenCalledTimes(2);
+    expect(tokenListStartPolling).toHaveBeenCalledTimes(1);
     expect(tokenListStartPolling).toHaveBeenCalledWith('0x1');
-    expect(tokenListStartPolling).toHaveBeenCalledWith('0x89');
 
     // Stop polling on dismount
     unmount();
-    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(2);
+    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledTimes(1);
     expect(tokenListStopPollingByPollingToken).toHaveBeenCalledWith(
       '0x1_token',
     );
-    expect(tokenListStopPollingByPollingToken).toHaveBeenCalledWith(
-      '0x89_token',
-    );
   });
 
   it('should not poll before onboarding is completed', async () => {
diff --git a/ui/hooks/useTokenListPolling.ts b/ui/hooks/useTokenListPolling.ts
index 9b43c3c6959a..7f7de517c304 100644
--- a/ui/hooks/useTokenListPolling.ts
+++ b/ui/hooks/useTokenListPolling.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
 import {
+  getCurrentChainId,
   getNetworkConfigurationsByChainId,
   getPetnamesEnabled,
   getUseExternalServices,
@@ -17,6 +18,7 @@ import {
 import useMultiPolling from './useMultiPolling';
 
 const useTokenListPolling = () => {
+  const currentChainId = useSelector(getCurrentChainId);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
   const useTokenDetection = useSelector(getUseTokenDetection);
   const useTransactionSimulations = useSelector(getUseTransactionSimulations);
@@ -31,10 +33,14 @@ const useTokenListPolling = () => {
     useExternalServices &&
     (useTokenDetection || petnamesEnabled || useTransactionSimulations);
 
+  const chainIds = process.env.PORTFOLIO_VIEW
+    ? Object.keys(networkConfigurations)
+    : [currentChainId];
+
   useMultiPolling({
     startPolling: tokenListStartPolling,
     stopPollingByPollingToken: tokenListStopPollingByPollingToken,
-    input: enabled ? Object.keys(networkConfigurations) : [],
+    input: enabled ? chainIds : [],
   });
 
   return {};